From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 8 May 2014 12:32:16 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2356
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b46443ee9cd30824115d221eae9dbf45d04b764c;p=imagemagick

---

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 5436eb75b..2d5c9cc22 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2014 ImageMagick Studio LLC"
-#define MagickSVNRevision  "15595:15606M"
+#define MagickSVNRevision  "15686:15688M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
@@ -48,7 +48,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2014-04-28"
+#define MagickReleaseDate  "2014-05-08"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"
diff --git a/coders/jp2.c b/coders/jp2.c
index 3af3f3c91..b1c3375ea 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -340,11 +340,10 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
   opj_stream_set_write_function(jp2_stream,JP2WriteHandler);
   opj_stream_set_seek_function(jp2_stream,JP2SeekHandler);
   opj_stream_set_skip_function(jp2_stream,JP2SkipHandler);
-  opj_stream_set_user_data(jp2_stream,image);
+  opj_stream_set_user_data(jp2_stream,image,NULL);
   opj_stream_set_user_data_length(jp2_stream,GetBlobSize(image));
   if (opj_read_header(jp2_stream,jp2_codec,&jp2_image) == 0)
     {
-      opj_stream_set_user_data(jp2_stream,NULL);
       opj_stream_destroy(jp2_stream);
       opj_destroy_codec(jp2_codec);
       ThrowReaderException(DelegateError,"UnableToDecodeImageFile");
@@ -359,7 +358,6 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
         image->extract_info.y+image->rows);
       if (jp2_status == 0)
         {
-          opj_stream_set_user_data(jp2_stream,NULL);
           opj_stream_destroy(jp2_stream);
           opj_destroy_codec(jp2_codec);
           opj_image_destroy(jp2_image);
@@ -369,19 +367,16 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
   if ((opj_decode(jp2_codec,jp2_stream,jp2_image) == 0) ||
       (opj_end_decompress(jp2_codec,jp2_stream) == 0))
     {
-      opj_stream_set_user_data(jp2_stream,NULL);
       opj_stream_destroy(jp2_stream);
       opj_destroy_codec(jp2_codec);
       opj_image_destroy(jp2_image);
       ThrowReaderException(DelegateError,"UnableToDecodeImageFile");
     }
-  opj_stream_set_user_data(jp2_stream,NULL);
   opj_stream_destroy(jp2_stream);
   for (i=0; i < (ssize_t) jp2_image->numcomps; i++)
   {
     if ((jp2_image->comps[i].dx == 0) || (jp2_image->comps[i].dy == 0))
       {
-        opj_stream_set_user_data(jp2_stream,NULL);
         opj_destroy_codec(jp2_codec);
         opj_image_destroy(jp2_image);
         ThrowReaderException(CoderError,"IrregularChannelGeometryNotSupported")
@@ -1024,7 +1019,7 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
   opj_stream_set_write_function(jp2_stream,JP2WriteHandler);
   opj_stream_set_seek_function(jp2_stream,JP2SeekHandler);
   opj_stream_set_skip_function(jp2_stream,JP2SkipHandler);
-  opj_stream_set_user_data(jp2_stream,image);
+  opj_stream_set_user_data(jp2_stream,image,NULL);
   if (jp2_stream == (opj_stream_t *) NULL)
     ThrowWriterException(DelegateError,"UnableToEncodeImageFile");
   jp2_status=opj_start_compress(jp2_codec,jp2_image,jp2_stream);
@@ -1033,7 +1028,6 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
   if ((opj_encode(jp2_codec,jp2_stream) == 0) ||
       (opj_end_compress(jp2_codec,jp2_stream) == 0))
     {
-      opj_stream_set_user_data(jp2_stream,NULL);
       opj_stream_destroy(jp2_stream);
       opj_destroy_codec(jp2_codec);
       opj_image_destroy(jp2_image);
@@ -1042,7 +1036,6 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
   /*
     Free resources.
   */
-  opj_stream_set_user_data(jp2_stream,NULL);
   opj_stream_destroy(jp2_stream);
   opj_destroy_codec(jp2_codec);
   opj_image_destroy(jp2_image);
diff --git a/configure b/configure
index a246fc2c0..439e462e3 100755
--- a/configure
+++ b/configure
@@ -3697,7 +3697,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=15595:15606M
+MAGICK_SVN_REVISION=15686:15688M
 
 
 # Substitute library versioning
@@ -30131,12 +30131,12 @@ if test -n "$LIBOPENJP2_CFLAGS"; then
     pkg_cv_LIBOPENJP2_CFLAGS="$LIBOPENJP2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenjp2 >= 2.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libopenjp2 >= 2.0.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenjp2 >= 2.0.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libopenjp2 >= 2.0.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBOPENJP2_CFLAGS=`$PKG_CONFIG --cflags "libopenjp2 >= 2.0.0" 2>/dev/null`
+  pkg_cv_LIBOPENJP2_CFLAGS=`$PKG_CONFIG --cflags "libopenjp2 >= 2.0.1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -30147,12 +30147,12 @@ if test -n "$LIBOPENJP2_LIBS"; then
     pkg_cv_LIBOPENJP2_LIBS="$LIBOPENJP2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenjp2 >= 2.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libopenjp2 >= 2.0.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenjp2 >= 2.0.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libopenjp2 >= 2.0.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBOPENJP2_LIBS=`$PKG_CONFIG --libs "libopenjp2 >= 2.0.0" 2>/dev/null`
+  pkg_cv_LIBOPENJP2_LIBS=`$PKG_CONFIG --libs "libopenjp2 >= 2.0.1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -30170,9 +30170,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBOPENJP2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libopenjp2 >= 2.0.0" 2>&1`
+	        LIBOPENJP2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libopenjp2 >= 2.0.1" 2>&1`
         else
-	        LIBOPENJP2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libopenjp2 >= 2.0.0" 2>&1`
+	        LIBOPENJP2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libopenjp2 >= 2.0.1" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBOPENJP2_PKG_ERRORS" >&5
diff --git a/configure.ac b/configure.ac
index 5aee0da84..c6e2c0998 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2408,7 +2408,7 @@ LIBOPENJP2_LIBS=""
 LIBOPENJP2_PKG=""
 if test "x$with_openjp2" = "xyes"; then
     AC_MSG_RESULT([-------------------------------------------------------------])
-    PKG_CHECK_MODULES(LIBOPENJP2,[libopenjp2 >= 2.0.0], have_openjp2=yes, have_openjp2=no)
+    PKG_CHECK_MODULES(LIBOPENJP2,[libopenjp2 >= 2.0.1], have_openjp2=yes, have_openjp2=no)
     AC_MSG_RESULT([])
 fi