]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Tue, 20 Apr 2010 01:10:41 +0000 (01:10 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Tue, 20 Apr 2010 01:10:41 +0000 (01:10 +0000)
magick/image.c
magick/random.c

index 33d3777448309ff06467e3f62cfe388340893405..e484a3dddc4788fd380b776658ad8fa1ed570dc9 100644 (file)
@@ -604,7 +604,7 @@ MagickExport Image *AppendImages(const Image *image,
       }
       sync=SyncCacheViewAuthenticPixels(append_view,exception);
       if (sync == MagickFalse)
-        continue;
+        status=MagickFalse;
     }
     image_view=DestroyCacheView(image_view);
     proceed=SetImageProgress(image,AppendImageTag,n,number_images);
index 07e85926c87d3a9282dd5dd0cbf139998640a364..fe31891e6ea86e6c0a6a58287e837eea03da4f0e 100644 (file)
@@ -107,7 +107,7 @@ struct _RandomInfo
 /*
   External declarations.
 */
-#if defined(__APPLE__)
+#if defined(__APPLE__) && !defined(TARGET_OS_IPHONE)
 #include <crt_externs.h>
 #define environ (*_NSGetEnviron())
 #endif