OS X fixes by Andrew Kerr

git-svn-id: https://jmagick.svn.sf.net/svnroot/jmagick/trunk@69 00265e9a-a446-0410-a409-fb6d3c48c71e

Make.rules

@@ -1,7 +1,7 @@
 # Copyright (C) 1999 Eric Yeo. All rights reserved.
 
 ifeq ($(strip $(OS)),Darwin)
-  DARWIN = true
+DARWIN = true
 endif
 
 
@@ -172,8 +172,8 @@ $(JNI_LIB): $(JNI_OBJ)
 	@-ln -s ./jmagick-$(MAJOR).$(MINOR).$(MICRO).jar $(PROJ_BASE_DIR)/lib/jmagick.jar
 ifdef DARWIN
 	# Mac OS X
-    @-echo "Using install_name_tool..."
-    @-/usr/bin/install_name_tool -id $(PROJ_BASE_DIR)lib/lib$(JNI_LIB_NAME)$(SHARED_LIB_EXT) $(PROJ_BASE_DIR)/lib/lib$(JNI_LIB_NAME)-$(MAJOR).$(MINOR).$(MICRO)$(SHARED_LIB_EXT)
+	@-echo "Using install_name_tool..."
+	@-/usr/bin/install_name_tool -id $(PROJ_BASE_DIR)lib/lib$(JNI_LIB_NAME)$(SHARED_LIB_EXT) $(PROJ_BASE_DIR)/lib/lib$(JNI_LIB_NAME)-$(MAJOR).$(MINOR).$(MICRO)$(SHARED_LIB_EXT)
 endif
 
 ##	@-install_name_tool -id $(JNI_LIB) $(PROJ_BASE_DIR)/lib/lib$(JNI_LIB_NAME)-$(MAJOR).$(MINOR).$(MICRO)$(SHARED_LIB_EXT)

src/magick/magick_MagickImage.c

@@ -4277,7 +4277,7 @@ JNIEXPORT jobject JNICALL Java_magick_MagickImage_trimImage
  * Signature: (DD)Lmagick/MagickImage;
  */
 JNIEXPORT jobject JNICALL Java_magick_MagickImage_blurImageChannel
-  (JNIEnv *env, jobject self, int channelType, jdouble radius, jdouble sigma)
+  (JNIEnv *env, jobject self, jint channelType, jdouble radius, jdouble sigma)
 {
     Image *image = NULL, *blurredImage = NULL;
     jobject newObj;