From: cristy Date: Mon, 13 Aug 2012 13:07:32 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5148 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84713a3f3c3faafc53488c0307d48bca0902bea9;p=imagemagick --- diff --git a/MagickCore/version.h b/MagickCore/version.h index de3c608ca..48debe6a9 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC" -#define MagickSVNRevision "8906:8907M" +#define MagickSVNRevision "8912:8924M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 7 #define MagickLibMinInterface 7 -#define MagickReleaseDate "2012-08-12" +#define MagickReleaseDate "2012-08-13" #define MagickChangeDate "20120808" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/Makefile.in b/Makefile.in index 5125c28d5..2ca0189b3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -512,29 +512,29 @@ am__MagickCore_libMagickCore_la_SOURCES_DIST = \ coders/dpx.c coders/fax.c coders/fd.c coders/fits.c \ coders/gif.c coders/gradient.c coders/gray.c coders/hald.c \ coders/hdr.c coders/histogram.c coders/hrz.c coders/html.c \ - coders/icon.c coders/info.c coders/inline.c coders/ipl.c \ - coders/label.c coders/mac.c coders/magick.c coders/map.c \ - coders/mat.c coders/matte.c coders/meta.c coders/miff.c \ - coders/mono.c coders/mpc.c coders/mpeg.c coders/mpr.c \ - coders/msl.c coders/mtv.c coders/mvg.c coders/null.c \ - coders/otb.c coders/palm.c coders/pango.c coders/pattern.c \ - coders/pcd.c coders/pcl.c coders/pcx.c coders/pdb.c \ - coders/pdf.c coders/pes.c coders/pict.c coders/pix.c \ - coders/plasma.c coders/pnm.c coders/preview.c coders/ps.c \ - coders/ps2.c coders/ps3.c coders/psd.c coders/pwp.c \ - coders/raw.c coders/rgb.c coders/rla.c coders/rle.c \ - coders/scr.c coders/sct.c coders/sfw.c coders/sgi.c \ - coders/stegano.c coders/sun.c coders/svg.c coders/tga.c \ - coders/thumbnail.c coders/tile.c coders/tim.c coders/ttf.c \ - coders/txt.c coders/uil.c coders/url.c coders/uyvy.c \ - coders/vicar.c coders/vid.c coders/viff.c coders/wbmp.c \ - coders/wpg.c coders/xbm.c coders/xc.c coders/xcf.c \ - coders/xpm.c coders/xps.c coders/ycbcr.c coders/yuv.c \ - coders/dps.c coders/djvu.c coders/exr.c coders/fpx.c \ - coders/clipboard.c coders/emf.c coders/jbig.c coders/jpeg.c \ - coders/jp2.c coders/png.c coders/ept.c coders/tiff.c \ - coders/webp.c coders/wmf.c coders/x.c coders/xwd.c \ - filters/analyze.c + coders/jnx.c coders/icon.c coders/info.c coders/inline.c \ + coders/ipl.c coders/label.c coders/mac.c coders/magick.c \ + coders/map.c coders/mat.c coders/matte.c coders/meta.c \ + coders/miff.c coders/mono.c coders/mpc.c coders/mpeg.c \ + coders/mpr.c coders/msl.c coders/mtv.c coders/mvg.c \ + coders/null.c coders/otb.c coders/palm.c coders/pango.c \ + coders/pattern.c coders/pcd.c coders/pcl.c coders/pcx.c \ + coders/pdb.c coders/pdf.c coders/pes.c coders/pict.c \ + coders/pix.c coders/plasma.c coders/pnm.c coders/preview.c \ + coders/ps.c coders/ps2.c coders/ps3.c coders/psd.c \ + coders/pwp.c coders/raw.c coders/rgb.c coders/rla.c \ + coders/rle.c coders/scr.c coders/sct.c coders/sfw.c \ + coders/sgi.c coders/stegano.c coders/sun.c coders/svg.c \ + coders/tga.c coders/thumbnail.c coders/tile.c coders/tim.c \ + coders/ttf.c coders/txt.c coders/uil.c coders/url.c \ + coders/uyvy.c coders/vicar.c coders/vid.c coders/viff.c \ + coders/wbmp.c coders/wpg.c coders/xbm.c coders/xc.c \ + coders/xcf.c coders/xpm.c coders/xps.c coders/ycbcr.c \ + coders/yuv.c coders/dps.c coders/djvu.c coders/exr.c \ + coders/fpx.c coders/clipboard.c coders/emf.c coders/jbig.c \ + coders/jpeg.c coders/jp2.c coders/png.c coders/ept.c \ + coders/tiff.c coders/webp.c coders/wmf.c coders/x.c \ + coders/xwd.c filters/analyze.c am__objects_1 = MagickCore/MagickCore_libMagickCore_la-accelerate.lo \ MagickCore/MagickCore_libMagickCore_la-animate.lo \ MagickCore/MagickCore_libMagickCore_la-annotate.lo \ @@ -681,6 +681,7 @@ am__objects_16 = coders/MagickCore_libMagickCore_la-aai.lo \ coders/MagickCore_libMagickCore_la-histogram.lo \ coders/MagickCore_libMagickCore_la-hrz.lo \ coders/MagickCore_libMagickCore_la-html.lo \ + coders/MagickCore_libMagickCore_la-jnx.lo \ coders/MagickCore_libMagickCore_la-icon.lo \ coders/MagickCore_libMagickCore_la-info.lo \ coders/MagickCore_libMagickCore_la-inline.lo \ @@ -1137,6 +1138,13 @@ coders_jbig_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $@ @JBIG_DELEGATE_TRUE@@WITH_MODULES_TRUE@am_coders_jbig_la_rpath = \ @JBIG_DELEGATE_TRUE@@WITH_MODULES_TRUE@ -rpath $(codersdir) +coders_jnx_la_DEPENDENCIES = $(MAGICKCORE_LIBS) +am_coders_jnx_la_OBJECTS = coders/coders_jnx_la-jnx.lo +coders_jnx_la_OBJECTS = $(am_coders_jnx_la_OBJECTS) +coders_jnx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(coders_jnx_la_LDFLAGS) $(LDFLAGS) -o $@ +@WITH_MODULES_TRUE@am_coders_jnx_la_rpath = -rpath $(codersdir) coders_jp2_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_coders_jp2_la_OBJECTS = coders/coders_jp2_la-jp2.lo @@ -2092,50 +2100,50 @@ SOURCES = $(Magick___lib_libMagick___la_SOURCES) \ $(coders_hrz_la_SOURCES) $(coders_html_la_SOURCES) \ $(coders_icon_la_SOURCES) $(coders_info_la_SOURCES) \ $(coders_inline_la_SOURCES) $(coders_ipl_la_SOURCES) \ - $(coders_jbig_la_SOURCES) $(coders_jp2_la_SOURCES) \ - $(coders_jpeg_la_SOURCES) $(coders_label_la_SOURCES) \ - $(coders_mac_la_SOURCES) $(coders_magick_la_SOURCES) \ - $(coders_map_la_SOURCES) $(coders_mat_la_SOURCES) \ - $(coders_matte_la_SOURCES) $(coders_meta_la_SOURCES) \ - $(coders_miff_la_SOURCES) $(coders_mono_la_SOURCES) \ - $(coders_mpc_la_SOURCES) $(coders_mpeg_la_SOURCES) \ - $(coders_mpr_la_SOURCES) $(coders_msl_la_SOURCES) \ - $(coders_mtv_la_SOURCES) $(coders_mvg_la_SOURCES) \ - $(coders_null_la_SOURCES) $(coders_otb_la_SOURCES) \ - $(coders_palm_la_SOURCES) $(coders_pango_la_SOURCES) \ - $(coders_pattern_la_SOURCES) $(coders_pcd_la_SOURCES) \ - $(coders_pcl_la_SOURCES) $(coders_pcx_la_SOURCES) \ - $(coders_pdb_la_SOURCES) $(coders_pdf_la_SOURCES) \ - $(coders_pes_la_SOURCES) $(coders_pict_la_SOURCES) \ - $(coders_pix_la_SOURCES) $(coders_plasma_la_SOURCES) \ - $(coders_png_la_SOURCES) $(coders_pnm_la_SOURCES) \ - $(coders_preview_la_SOURCES) $(coders_ps_la_SOURCES) \ - $(coders_ps2_la_SOURCES) $(coders_ps3_la_SOURCES) \ - $(coders_psd_la_SOURCES) $(coders_pwp_la_SOURCES) \ - $(coders_raw_la_SOURCES) $(coders_rgb_la_SOURCES) \ - $(coders_rla_la_SOURCES) $(coders_rle_la_SOURCES) \ - $(coders_scr_la_SOURCES) $(coders_sct_la_SOURCES) \ - $(coders_sfw_la_SOURCES) $(coders_sgi_la_SOURCES) \ - $(coders_stegano_la_SOURCES) $(coders_sun_la_SOURCES) \ - $(coders_svg_la_SOURCES) $(coders_tga_la_SOURCES) \ - $(coders_thumbnail_la_SOURCES) $(coders_tiff_la_SOURCES) \ - $(coders_tile_la_SOURCES) $(coders_tim_la_SOURCES) \ - $(coders_ttf_la_SOURCES) $(coders_txt_la_SOURCES) \ - $(coders_uil_la_SOURCES) $(coders_url_la_SOURCES) \ - $(coders_uyvy_la_SOURCES) $(coders_vicar_la_SOURCES) \ - $(coders_vid_la_SOURCES) $(coders_viff_la_SOURCES) \ - $(coders_wbmp_la_SOURCES) $(coders_webp_la_SOURCES) \ - $(coders_wmf_la_SOURCES) $(coders_wpg_la_SOURCES) \ - $(coders_x_la_SOURCES) $(coders_xbm_la_SOURCES) \ - $(coders_xc_la_SOURCES) $(coders_xcf_la_SOURCES) \ - $(coders_xpm_la_SOURCES) $(coders_xps_la_SOURCES) \ - $(coders_xwd_la_SOURCES) $(coders_ycbcr_la_SOURCES) \ - $(coders_yuv_la_SOURCES) $(filters_analyze_la_SOURCES) \ - $(ltdl_dld_link_la_SOURCES) $(ltdl_dlopen_la_SOURCES) \ - $(ltdl_dyld_la_SOURCES) $(ltdl_libltdl_la_SOURCES) \ - $(ltdl_libltdlc_la_SOURCES) $(ltdl_load_add_on_la_SOURCES) \ - $(ltdl_loadlibrary_la_SOURCES) $(ltdl_shl_load_la_SOURCES) \ - $(Magick___demo_analyze_SOURCES) \ + $(coders_jbig_la_SOURCES) $(coders_jnx_la_SOURCES) \ + $(coders_jp2_la_SOURCES) $(coders_jpeg_la_SOURCES) \ + $(coders_label_la_SOURCES) $(coders_mac_la_SOURCES) \ + $(coders_magick_la_SOURCES) $(coders_map_la_SOURCES) \ + $(coders_mat_la_SOURCES) $(coders_matte_la_SOURCES) \ + $(coders_meta_la_SOURCES) $(coders_miff_la_SOURCES) \ + $(coders_mono_la_SOURCES) $(coders_mpc_la_SOURCES) \ + $(coders_mpeg_la_SOURCES) $(coders_mpr_la_SOURCES) \ + $(coders_msl_la_SOURCES) $(coders_mtv_la_SOURCES) \ + $(coders_mvg_la_SOURCES) $(coders_null_la_SOURCES) \ + $(coders_otb_la_SOURCES) $(coders_palm_la_SOURCES) \ + $(coders_pango_la_SOURCES) $(coders_pattern_la_SOURCES) \ + $(coders_pcd_la_SOURCES) $(coders_pcl_la_SOURCES) \ + $(coders_pcx_la_SOURCES) $(coders_pdb_la_SOURCES) \ + $(coders_pdf_la_SOURCES) $(coders_pes_la_SOURCES) \ + $(coders_pict_la_SOURCES) $(coders_pix_la_SOURCES) \ + $(coders_plasma_la_SOURCES) $(coders_png_la_SOURCES) \ + $(coders_pnm_la_SOURCES) $(coders_preview_la_SOURCES) \ + $(coders_ps_la_SOURCES) $(coders_ps2_la_SOURCES) \ + $(coders_ps3_la_SOURCES) $(coders_psd_la_SOURCES) \ + $(coders_pwp_la_SOURCES) $(coders_raw_la_SOURCES) \ + $(coders_rgb_la_SOURCES) $(coders_rla_la_SOURCES) \ + $(coders_rle_la_SOURCES) $(coders_scr_la_SOURCES) \ + $(coders_sct_la_SOURCES) $(coders_sfw_la_SOURCES) \ + $(coders_sgi_la_SOURCES) $(coders_stegano_la_SOURCES) \ + $(coders_sun_la_SOURCES) $(coders_svg_la_SOURCES) \ + $(coders_tga_la_SOURCES) $(coders_thumbnail_la_SOURCES) \ + $(coders_tiff_la_SOURCES) $(coders_tile_la_SOURCES) \ + $(coders_tim_la_SOURCES) $(coders_ttf_la_SOURCES) \ + $(coders_txt_la_SOURCES) $(coders_uil_la_SOURCES) \ + $(coders_url_la_SOURCES) $(coders_uyvy_la_SOURCES) \ + $(coders_vicar_la_SOURCES) $(coders_vid_la_SOURCES) \ + $(coders_viff_la_SOURCES) $(coders_wbmp_la_SOURCES) \ + $(coders_webp_la_SOURCES) $(coders_wmf_la_SOURCES) \ + $(coders_wpg_la_SOURCES) $(coders_x_la_SOURCES) \ + $(coders_xbm_la_SOURCES) $(coders_xc_la_SOURCES) \ + $(coders_xcf_la_SOURCES) $(coders_xpm_la_SOURCES) \ + $(coders_xps_la_SOURCES) $(coders_xwd_la_SOURCES) \ + $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \ + $(filters_analyze_la_SOURCES) $(ltdl_dld_link_la_SOURCES) \ + $(ltdl_dlopen_la_SOURCES) $(ltdl_dyld_la_SOURCES) \ + $(ltdl_libltdl_la_SOURCES) $(ltdl_libltdlc_la_SOURCES) \ + $(ltdl_load_add_on_la_SOURCES) $(ltdl_loadlibrary_la_SOURCES) \ + $(ltdl_shl_load_la_SOURCES) $(Magick___demo_analyze_SOURCES) \ $(Magick___demo_button_SOURCES) $(Magick___demo_demo_SOURCES) \ $(Magick___demo_detrans_SOURCES) $(Magick___demo_flip_SOURCES) \ $(Magick___demo_gravity_SOURCES) \ @@ -2184,50 +2192,50 @@ DIST_SOURCES = $(Magick___lib_libMagick___la_SOURCES) \ $(coders_hrz_la_SOURCES) $(coders_html_la_SOURCES) \ $(coders_icon_la_SOURCES) $(coders_info_la_SOURCES) \ $(coders_inline_la_SOURCES) $(coders_ipl_la_SOURCES) \ - $(coders_jbig_la_SOURCES) $(coders_jp2_la_SOURCES) \ - $(coders_jpeg_la_SOURCES) $(coders_label_la_SOURCES) \ - $(coders_mac_la_SOURCES) $(coders_magick_la_SOURCES) \ - $(coders_map_la_SOURCES) $(coders_mat_la_SOURCES) \ - $(coders_matte_la_SOURCES) $(coders_meta_la_SOURCES) \ - $(coders_miff_la_SOURCES) $(coders_mono_la_SOURCES) \ - $(coders_mpc_la_SOURCES) $(coders_mpeg_la_SOURCES) \ - $(coders_mpr_la_SOURCES) $(coders_msl_la_SOURCES) \ - $(coders_mtv_la_SOURCES) $(coders_mvg_la_SOURCES) \ - $(coders_null_la_SOURCES) $(coders_otb_la_SOURCES) \ - $(coders_palm_la_SOURCES) $(coders_pango_la_SOURCES) \ - $(coders_pattern_la_SOURCES) $(coders_pcd_la_SOURCES) \ - $(coders_pcl_la_SOURCES) $(coders_pcx_la_SOURCES) \ - $(coders_pdb_la_SOURCES) $(coders_pdf_la_SOURCES) \ - $(coders_pes_la_SOURCES) $(coders_pict_la_SOURCES) \ - $(coders_pix_la_SOURCES) $(coders_plasma_la_SOURCES) \ - $(coders_png_la_SOURCES) $(coders_pnm_la_SOURCES) \ - $(coders_preview_la_SOURCES) $(coders_ps_la_SOURCES) \ - $(coders_ps2_la_SOURCES) $(coders_ps3_la_SOURCES) \ - $(coders_psd_la_SOURCES) $(coders_pwp_la_SOURCES) \ - $(coders_raw_la_SOURCES) $(coders_rgb_la_SOURCES) \ - $(coders_rla_la_SOURCES) $(coders_rle_la_SOURCES) \ - $(coders_scr_la_SOURCES) $(coders_sct_la_SOURCES) \ - $(coders_sfw_la_SOURCES) $(coders_sgi_la_SOURCES) \ - $(coders_stegano_la_SOURCES) $(coders_sun_la_SOURCES) \ - $(coders_svg_la_SOURCES) $(coders_tga_la_SOURCES) \ - $(coders_thumbnail_la_SOURCES) $(coders_tiff_la_SOURCES) \ - $(coders_tile_la_SOURCES) $(coders_tim_la_SOURCES) \ - $(coders_ttf_la_SOURCES) $(coders_txt_la_SOURCES) \ - $(coders_uil_la_SOURCES) $(coders_url_la_SOURCES) \ - $(coders_uyvy_la_SOURCES) $(coders_vicar_la_SOURCES) \ - $(coders_vid_la_SOURCES) $(coders_viff_la_SOURCES) \ - $(coders_wbmp_la_SOURCES) $(coders_webp_la_SOURCES) \ - $(coders_wmf_la_SOURCES) $(coders_wpg_la_SOURCES) \ - $(coders_x_la_SOURCES) $(coders_xbm_la_SOURCES) \ - $(coders_xc_la_SOURCES) $(coders_xcf_la_SOURCES) \ - $(coders_xpm_la_SOURCES) $(coders_xps_la_SOURCES) \ - $(coders_xwd_la_SOURCES) $(coders_ycbcr_la_SOURCES) \ - $(coders_yuv_la_SOURCES) $(filters_analyze_la_SOURCES) \ - $(ltdl_dld_link_la_SOURCES) $(ltdl_dlopen_la_SOURCES) \ - $(ltdl_dyld_la_SOURCES) $(ltdl_libltdl_la_SOURCES) \ - $(ltdl_libltdlc_la_SOURCES) $(ltdl_load_add_on_la_SOURCES) \ - $(ltdl_loadlibrary_la_SOURCES) $(ltdl_shl_load_la_SOURCES) \ - $(Magick___demo_analyze_SOURCES) \ + $(coders_jbig_la_SOURCES) $(coders_jnx_la_SOURCES) \ + $(coders_jp2_la_SOURCES) $(coders_jpeg_la_SOURCES) \ + $(coders_label_la_SOURCES) $(coders_mac_la_SOURCES) \ + $(coders_magick_la_SOURCES) $(coders_map_la_SOURCES) \ + $(coders_mat_la_SOURCES) $(coders_matte_la_SOURCES) \ + $(coders_meta_la_SOURCES) $(coders_miff_la_SOURCES) \ + $(coders_mono_la_SOURCES) $(coders_mpc_la_SOURCES) \ + $(coders_mpeg_la_SOURCES) $(coders_mpr_la_SOURCES) \ + $(coders_msl_la_SOURCES) $(coders_mtv_la_SOURCES) \ + $(coders_mvg_la_SOURCES) $(coders_null_la_SOURCES) \ + $(coders_otb_la_SOURCES) $(coders_palm_la_SOURCES) \ + $(coders_pango_la_SOURCES) $(coders_pattern_la_SOURCES) \ + $(coders_pcd_la_SOURCES) $(coders_pcl_la_SOURCES) \ + $(coders_pcx_la_SOURCES) $(coders_pdb_la_SOURCES) \ + $(coders_pdf_la_SOURCES) $(coders_pes_la_SOURCES) \ + $(coders_pict_la_SOURCES) $(coders_pix_la_SOURCES) \ + $(coders_plasma_la_SOURCES) $(coders_png_la_SOURCES) \ + $(coders_pnm_la_SOURCES) $(coders_preview_la_SOURCES) \ + $(coders_ps_la_SOURCES) $(coders_ps2_la_SOURCES) \ + $(coders_ps3_la_SOURCES) $(coders_psd_la_SOURCES) \ + $(coders_pwp_la_SOURCES) $(coders_raw_la_SOURCES) \ + $(coders_rgb_la_SOURCES) $(coders_rla_la_SOURCES) \ + $(coders_rle_la_SOURCES) $(coders_scr_la_SOURCES) \ + $(coders_sct_la_SOURCES) $(coders_sfw_la_SOURCES) \ + $(coders_sgi_la_SOURCES) $(coders_stegano_la_SOURCES) \ + $(coders_sun_la_SOURCES) $(coders_svg_la_SOURCES) \ + $(coders_tga_la_SOURCES) $(coders_thumbnail_la_SOURCES) \ + $(coders_tiff_la_SOURCES) $(coders_tile_la_SOURCES) \ + $(coders_tim_la_SOURCES) $(coders_ttf_la_SOURCES) \ + $(coders_txt_la_SOURCES) $(coders_uil_la_SOURCES) \ + $(coders_url_la_SOURCES) $(coders_uyvy_la_SOURCES) \ + $(coders_vicar_la_SOURCES) $(coders_vid_la_SOURCES) \ + $(coders_viff_la_SOURCES) $(coders_wbmp_la_SOURCES) \ + $(coders_webp_la_SOURCES) $(coders_wmf_la_SOURCES) \ + $(coders_wpg_la_SOURCES) $(coders_x_la_SOURCES) \ + $(coders_xbm_la_SOURCES) $(coders_xc_la_SOURCES) \ + $(coders_xcf_la_SOURCES) $(coders_xpm_la_SOURCES) \ + $(coders_xps_la_SOURCES) $(coders_xwd_la_SOURCES) \ + $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \ + $(filters_analyze_la_SOURCES) $(ltdl_dld_link_la_SOURCES) \ + $(ltdl_dlopen_la_SOURCES) $(ltdl_dyld_la_SOURCES) \ + $(ltdl_libltdl_la_SOURCES) $(ltdl_libltdlc_la_SOURCES) \ + $(ltdl_load_add_on_la_SOURCES) $(ltdl_loadlibrary_la_SOURCES) \ + $(ltdl_shl_load_la_SOURCES) $(Magick___demo_analyze_SOURCES) \ $(Magick___demo_button_SOURCES) $(Magick___demo_demo_SOURCES) \ $(Magick___demo_detrans_SOURCES) $(Magick___demo_flip_SOURCES) \ $(Magick___demo_gravity_SOURCES) \ @@ -3136,6 +3144,7 @@ MAGICKCORE_CODER_SRCS = \ coders/histogram.c \ coders/hrz.c \ coders/html.c \ + coders/jnx.c \ coders/icon.c \ coders/info.c \ coders/inline.c \ @@ -3255,6 +3264,7 @@ MAGICKCORE_CODER_SRCS = \ @WITH_MODULES_TRUE@ coders/histogram.la \ @WITH_MODULES_TRUE@ coders/hrz.la \ @WITH_MODULES_TRUE@ coders/html.la \ +@WITH_MODULES_TRUE@ coders/jnx.la \ @WITH_MODULES_TRUE@ coders/icon.la \ @WITH_MODULES_TRUE@ coders/info.la \ @WITH_MODULES_TRUE@ coders/inline.la \ @@ -3570,6 +3580,12 @@ coders_html_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_html_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_html_la_LIBADD = $(MAGICKCORE_LIBS) +# JNX coder module +coders_jnx_la_SOURCES = coders/jnx.c +coders_jnx_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) +coders_jnx_la_LDFLAGS = $(MODULECOMMONFLAGS) +coders_jnx_la_LIBADD = $(MAGICKCORE_LIBS) + # ICON coder module coders_icon_la_SOURCES = coders/icon.c coders_icon_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) @@ -5695,6 +5711,8 @@ coders/MagickCore_libMagickCore_la-hrz.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_la-html.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) +coders/MagickCore_libMagickCore_la-jnx.lo: coders/$(am__dirstamp) \ + coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_la-icon.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_la-info.lo: coders/$(am__dirstamp) \ @@ -6133,6 +6151,10 @@ coders/coders_jbig_la-jbig.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) coders/jbig.la: $(coders_jbig_la_OBJECTS) $(coders_jbig_la_DEPENDENCIES) $(EXTRA_coders_jbig_la_DEPENDENCIES) coders/$(am__dirstamp) $(AM_V_CCLD)$(coders_jbig_la_LINK) $(am_coders_jbig_la_rpath) $(coders_jbig_la_OBJECTS) $(coders_jbig_la_LIBADD) $(LIBS) +coders/coders_jnx_la-jnx.lo: coders/$(am__dirstamp) \ + coders/$(DEPDIR)/$(am__dirstamp) +coders/jnx.la: $(coders_jnx_la_OBJECTS) $(coders_jnx_la_DEPENDENCIES) $(EXTRA_coders_jnx_la_DEPENDENCIES) coders/$(am__dirstamp) + $(AM_V_CCLD)$(coders_jnx_la_LINK) $(am_coders_jnx_la_rpath) $(coders_jnx_la_OBJECTS) $(coders_jnx_la_LIBADD) $(LIBS) coders/coders_jp2_la-jp2.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) coders/jp2.la: $(coders_jp2_la_OBJECTS) $(coders_jp2_la_DEPENDENCIES) $(EXTRA_coders_jp2_la_DEPENDENCIES) coders/$(am__dirstamp) @@ -7023,6 +7045,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-inline.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-ipl.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-jbig.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-jnx.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-jp2.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-jpeg.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-label.Plo@am__quote@ @@ -7142,6 +7165,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_inline_la-inline.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_ipl_la-ipl.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_jbig_la-jbig.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_jnx_la-jnx.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_jp2_la-jp2.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_jpeg_la-jpeg.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_label_la-label.Plo@am__quote@ @@ -8129,6 +8153,13 @@ coders/MagickCore_libMagickCore_la-html.lo: coders/html.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-html.lo `test -f 'coders/html.c' || echo '$(srcdir)/'`coders/html.c +coders/MagickCore_libMagickCore_la-jnx.lo: coders/jnx.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-jnx.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-jnx.Tpo -c -o coders/MagickCore_libMagickCore_la-jnx.lo `test -f 'coders/jnx.c' || echo '$(srcdir)/'`coders/jnx.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-jnx.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-jnx.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coders/jnx.c' object='coders/MagickCore_libMagickCore_la-jnx.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-jnx.lo `test -f 'coders/jnx.c' || echo '$(srcdir)/'`coders/jnx.c + coders/MagickCore_libMagickCore_la-icon.lo: coders/icon.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-icon.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-icon.Tpo -c -o coders/MagickCore_libMagickCore_la-icon.lo `test -f 'coders/icon.c' || echo '$(srcdir)/'`coders/icon.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-icon.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-icon.Plo @@ -9221,6 +9252,13 @@ coders/coders_jbig_la-jbig.lo: coders/jbig.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_jbig_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_jbig_la-jbig.lo `test -f 'coders/jbig.c' || echo '$(srcdir)/'`coders/jbig.c +coders/coders_jnx_la-jnx.lo: coders/jnx.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_jnx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_jnx_la-jnx.lo -MD -MP -MF coders/$(DEPDIR)/coders_jnx_la-jnx.Tpo -c -o coders/coders_jnx_la-jnx.lo `test -f 'coders/jnx.c' || echo '$(srcdir)/'`coders/jnx.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_jnx_la-jnx.Tpo coders/$(DEPDIR)/coders_jnx_la-jnx.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coders/jnx.c' object='coders/coders_jnx_la-jnx.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_jnx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_jnx_la-jnx.lo `test -f 'coders/jnx.c' || echo '$(srcdir)/'`coders/jnx.c + coders/coders_jp2_la-jp2.lo: coders/jp2.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_jp2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_jp2_la-jp2.lo -MD -MP -MF coders/$(DEPDIR)/coders_jp2_la-jp2.Tpo -c -o coders/coders_jp2_la-jp2.lo `test -f 'coders/jp2.c' || echo '$(srcdir)/'`coders/jp2.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_jp2_la-jp2.Tpo coders/$(DEPDIR)/coders_jp2_la-jp2.Plo diff --git a/coders/Makefile.am b/coders/Makefile.am index d59226622..18f66e289 100644 --- a/coders/Makefile.am +++ b/coders/Makefile.am @@ -114,6 +114,7 @@ MAGICKCORE_CODER_SRCS = \ coders/histogram.c \ coders/hrz.c \ coders/html.c \ + coders/jnx.c \ coders/icon.c \ coders/info.c \ coders/inline.c \ @@ -233,6 +234,7 @@ coders_LTLIBRARIES = \ coders/histogram.la \ coders/hrz.la \ coders/html.la \ + coders/jnx.la \ coders/icon.la \ coders/info.la \ coders/inline.la \ @@ -550,6 +552,12 @@ coders_html_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_html_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_html_la_LIBADD = $(MAGICKCORE_LIBS) +# JNX coder module +coders_jnx_la_SOURCES = coders/jnx.c +coders_jnx_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) +coders_jnx_la_LDFLAGS = $(MODULECOMMONFLAGS) +coders_jnx_la_LIBADD = $(MAGICKCORE_LIBS) + # ICON coder module coders_icon_la_SOURCES = coders/icon.c coders_icon_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) diff --git a/coders/jnx.c b/coders/jnx.c new file mode 100644 index 000000000..d0433633d --- /dev/null +++ b/coders/jnx.c @@ -0,0 +1,154 @@ +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% JJJ N N X X % +% J NN N X X % +% J N N N X % +% J J N NN X X % +% JJ N N X X % +% % +% % +% Read/Write Garmin Image Format % +% % +% John Cristy % +% July 2012 % +% % +% % +% Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization % +% dedicated to making software imaging solutions freely available. % +% % +% You may not use this file except in compliance with the License. You may % +% obtain a copy of the License at % +% % +% http://www.imagemagick.org/script/license.php % +% % +% Unless required by applicable law or agreed to in writing, software % +% distributed under the License is distributed on an "AS IS" BASIS, % +% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. % +% See the License for the specific language governing permissions and % +% limitations under the License. % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% +*/ + +/* + Include declarations. +*/ + +/* + Include declarations. +*/ +#include "MagickCore/studio.h" +#include "MagickCore/blob.h" +#include "MagickCore/blob-private.h" +#include "MagickCore/cache.h" +#include "MagickCore/colorspace.h" +#include "MagickCore/colorspace-private.h" +#include "MagickCore/exception.h" +#include "MagickCore/exception-private.h" +#include "MagickCore/image.h" +#include "MagickCore/image-private.h" +#include "MagickCore/list.h" +#include "MagickCore/magick.h" +#include "MagickCore/memory_.h" +#include "MagickCore/module.h" +#include "MagickCore/monitor.h" +#include "MagickCore/monitor-private.h" +#include "MagickCore/pixel-accessor.h" +#include "MagickCore/quantum-private.h" +#include "MagickCore/static.h" +#include "MagickCore/string_.h" + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% R e a d J N X I m a g e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% ReadJNXImage() reads an image in the Garmin tile storage format and returns +% it. It allocates the memory necessary for the new Image structure and +% returns a pointer to the new image. +% +% The format of the ReadJNXImage method is: +% +% Image *ReadJNXImage(const ImageInfo *image_info,ExceptionInfo *exception) +% +% A description of each parameter follows: +% +% o image_info: the image info. +% +% o exception: return any errors or warnings in this structure. +% +*/ +static Image *ReadJNXImage(const ImageInfo *image_info,ExceptionInfo *exception) +{ + return((Image *) NULL); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% R e g i s t e r J N X I m a g e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% RegisterJNXImage() adds attributes for the JNX image format to the list +% of supported formats. The attributes include the image format tag, a +% method to read and/or write the format, whether the format supports the +% saving of more than one frame to the same file or blob, whether the format +% supports native in-memory I/O, and a brief description of the format. +% +% The format of the RegisterJNXImage method is: +% +% size_t RegisterJNXImage(void) +% +*/ +ModuleExport size_t RegisterJNXImage(void) +{ + MagickInfo + *entry; + + entry=SetMagickInfo("JNX"); + entry->decoder=(DecodeImageHandler *) ReadJNXImage; + entry->description=ConstantString("Garmin tile storage format"); + entry->module=ConstantString("JNX"); + (void) RegisterMagickInfo(entry); + return(MagickImageCoderSignature); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% U n r e g i s t e r J N X I m a g e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% UnregisterJNXImage() removes format registrations made by the +% JNX module from the list of supported formats. +% +% The format of the UnregisterJNXImage method is: +% +% UnregisterJNXImage(void) +% +*/ +ModuleExport void UnregisterJNXImage(void) +{ + (void) UnregisterMagickInfo("JNX"); +} diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf index 1775cee70..9a3f776cd 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -5,7 +5,7 @@ ImageMagick ImageMagick: convert, edit, and compose images. - 2012-08-12 + 2012-08-13 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves. @@ -57,7 +57,7 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line stable - 2012-08-12 + 2012-08-13 7.0.0 -0 diff --git a/config/configure.xml b/config/configure.xml index ea79605dc..eb95d52d9 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index db7700a70..745369e30 100755 --- a/configure +++ b/configure @@ -3666,7 +3666,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE -MAGICK_SVN_REVISION=8906:8907M +MAGICK_SVN_REVISION=8912:8924M