Texel distances should be set properly for rotated images in a couple…

… of filters now.
linox · Jul 1, 2012 · 94f54eb · 94f54eb
1 parent 7fd9996
commit 94f54eb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/framework/Source/GPUImage3x3TextureSamplingFilter.m b/framework/Source/GPUImage3x3TextureSamplingFilter.m
@@ -75,8 +75,17 @@ - (void)setupFilterForSize:(CGSize)filterFrameSize;
 
         [GPUImageOpenGLESContext useImageProcessingContext];
         [filterProgram use];
-        glUniform1f(texelWidthUniform, _texelWidth);
-        glUniform1f(texelHeightUniform, _texelHeight);
+        if (GPUImageRotationSwapsWidthAndHeight(inputRotation))
+        {
+            glUniform1f(texelWidthUniform, _texelHeight);
+            glUniform1f(texelHeightUniform, _texelWidth);
+        }
+        else
+        {
+            glUniform1f(texelWidthUniform, _texelWidth);
+            glUniform1f(texelHeightUniform, _texelHeight);
+        }
+
     }
 }
 

diff --git a/framework/Source/GPUImageOutput.m b/framework/Source/GPUImageOutput.m
@@ -77,7 +77,8 @@ - (void)setInputTextureForTarget:(id<GPUImageInput>)target atIndex:(NSInteger)in
     [target setInputTexture:outputTexture atIndex:inputTextureIndex];
 }
 
-- (NSArray*)targets {
+- (NSArray*)targets;
+{
 	return [NSArray arrayWithArray:targets];
 }
 

diff --git a/framework/Source/GPUImageSharpenFilter.m b/framework/Source/GPUImageSharpenFilter.m
@@ -90,8 +90,17 @@ - (void)setupFilterForSize:(CGSize)filterFrameSize;
 {
     [GPUImageOpenGLESContext useImageProcessingContext];
     [filterProgram use];
-    glUniform1f(imageWidthFactorUniform, 1.0 / filterFrameSize.width);
-    glUniform1f(imageHeightFactorUniform, 1.0 / filterFrameSize.height);
+
+    if (GPUImageRotationSwapsWidthAndHeight(inputRotation))
+    {
+        glUniform1f(imageWidthFactorUniform, 1.0 / filterFrameSize.height);
+        glUniform1f(imageHeightFactorUniform, 1.0 / filterFrameSize.width);
+    }
+    else
+    {
+        glUniform1f(imageWidthFactorUniform, 1.0 / filterFrameSize.width);
+        glUniform1f(imageHeightFactorUniform, 1.0 / filterFrameSize.height);
+    }
 }
 
 #pragma mark -