Package: jmagick
Version: 6.6.9~20130201-svn99-1
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch



In Ubuntu, the attached patch was applied to achieve the following:

  * 02_jmagick_implicit_decl.patch: Include the missing prototype for
    getByteArrayFieldValue in jmagick.h for use by magick_MagickImage.c

The effects of this patch should be fairly self-explanatory.  It gets
rid of an implicit declaration when compiling magick_MagickImage.c, and
avoids an implicit pointer conversion as a result of same.

See http://wiki.debian.org/ImplicitPointerConversions for more on why
implicit pointer conversions are considered harmful.

... Adam


-- System Information:
Debian Release: wheezy/sid
  APT prefers trusty-updates
  APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 'trusty')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.11.0-12-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru jmagick-6.6.9~20130201-svn99/debian/changelog jmagick-6.6.9~20130201-svn99/debian/changelog
diff -Nru jmagick-6.6.9~20130201-svn99/debian/patches/02_jmagick_implicit_decl.patch jmagick-6.6.9~20130201-svn99/debian/patches/02_jmagick_implicit_decl.patch
--- jmagick-6.6.9~20130201-svn99/debian/patches/02_jmagick_implicit_decl.patch	1969-12-31 17:00:00.000000000 -0700
+++ jmagick-6.6.9~20130201-svn99/debian/patches/02_jmagick_implicit_decl.patch	2013-10-26 10:50:55.000000000 -0600
@@ -0,0 +1,37 @@
+Description: Include the missing prototype for getByteArrayFieldValue
+Author: Adam Conrad <adcon...@ubuntu.com>
+
+Index: jmagick-6.6.9~20130201-svn99/src/magick/jmagick.h
+===================================================================
+--- jmagick-6.6.9~20130201-svn99.orig/src/magick/jmagick.h	2013-10-26 10:45:26.000000000 -0600
++++ jmagick-6.6.9~20130201-svn99/src/magick/jmagick.h	2013-10-26 10:50:51.932356603 -0600
+@@ -110,6 +110,29 @@
+                      jint value);
+ 
+ /*
++ * Retrieve the byte array from the specified field.
++ *
++ * Input:
++ *   env        Java VM environment.
++ *   obj        Java object for which the value is to be retrieved.
++ *   fieldName  name of the field to be retrieved.
++ *   fieldID    if non-null, points to field ID. 0 to request retrieval.
++ *
++ * Output:
++ *   fieldID    if non-null, will contain the field ID.
++ *   size       the size of the array is returned here. Must not be NULL.
++ *
++ * Return:
++ *   The byte array requested. The caller is responsible for
++ *   deallocating this byte array.
++ */
++unsigned char* getByteArrayFieldValue(JNIEnv *env,
++                                      jobject obj,
++                                      const char *fieldName,
++                                      jfieldID *fieldID,
++                                      int *size);
++
++/*
+  * From a java.awt.Rectangle object, construct a ImageMagick
+  * RectangleInfo, as passed in from the parameter.
+  *
diff -Nru jmagick-6.6.9~20130201-svn99/debian/patches/series jmagick-6.6.9~20130201-svn99/debian/patches/series
--- jmagick-6.6.9~20130201-svn99/debian/patches/series	2013-10-07 22:10:07.000000000 -0600
+++ jmagick-6.6.9~20130201-svn99/debian/patches/series	2013-10-26 10:46:41.000000000 -0600
@@ -1,2 +1,2 @@
 01_fix_load_jnilib.patch
-
+02_jmagick_implicit_decl.patch
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Reply via email to