]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Sun, 25 Sep 2011 23:29:32 +0000 (23:29 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Sun, 25 Sep 2011 23:29:32 +0000 (23:29 +0000)
MagickCore/shear.c

index b7a5a78a24c0e2d75aaf88e8e797c1be021f8c2a..7d8659dc1ff6e46274cbb8772cffc5d9a45c717c 100644 (file)
@@ -1261,7 +1261,7 @@ static Image *IntegralRotateImage(const Image *image,size_t rotations,
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp critical (MagickCore_IntegralRotateImage)
 #endif
-            proceed=SetImageProgress(image,RotateImageTag,progress+=tile_height,
+            proceed=SetImageProgress(image,RotateImageTag,progress++,
               image->rows);
             if (proceed == MagickFalse)
               status=MagickFalse;
@@ -1275,23 +1275,6 @@ static Image *IntegralRotateImage(const Image *image,size_t rotations,
         page.x=(ssize_t) (page.width-rotate_image->columns-page.x);
       break;
     }
-    case 2:
-    {
-      /*
-        Rotate 180 degrees.
-      */
-            proceed=SetImageProgress(image,RotateImageTag,progress++,
-              image->rows);
-            if (proceed == MagickFalse)
-              status=MagickFalse;
-          }
-      }
-      if (page.width != 0)
-        page.x=(ssize_t) (page.width-rotate_image->columns-page.x);
-      if (page.height != 0)
-        page.y=(ssize_t) (page.height-rotate_image->rows-page.y);
-      break;
-    }
     case 3:
     {
       size_t
@@ -1417,25 +1400,6 @@ static Image *IntegralRotateImage(const Image *image,size_t rotations,
         page.x=(ssize_t) (page.width-rotate_image->columns-page.x);
       break;
     }
-    case 2:
-    {
-      /*
-        Rotate 180 degrees.
-      */
-            proceed=SetImageProgress(image,RotateImageTag,progress+=tile_height,
-              image->rows);
-            if (proceed == MagickFalse)
-              status=MagickFalse;
-          }
-      }
-      (void) SetImageProgress(image,RotateImageTag,(MagickOffsetType)
-        image->rows-1,image->rows);
-      Swap(page.width,page.height);
-      Swap(page.x,page.y);
-      if (page.height != 0)
-        page.y=(ssize_t) (page.height-rotate_image->rows-page.y);
-      break;
-    }
   }
   rotate_view=DestroyCacheView(rotate_view);
   image_view=DestroyCacheView(image_view);