diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config index bc6708cc35..931b975b65 100755 --- a/Magick++/bin/Magick++-config +++ b/Magick++/bin/Magick++-config @@ -43,10 +43,10 @@ while test $# -gt 0; do echo '6.6.8 Q16 ' ;; --cflags) - echo "-I${includedir} " + echo "-I${includedir} -fopenmp" ;; --cxxflags) - echo '-g -O2' + echo '-g -O2 -pthread' ;; --cppflags) echo '-I/usr/local/include/ImageMagick' diff --git a/Makefile.in b/Makefile.in index de56fb7094..3fefc53583 100644 --- a/Makefile.in +++ b/Makefile.in @@ -629,6 +629,13 @@ coders_hald_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(coders_hald_la_LDFLAGS) $(LDFLAGS) -o \ $@ @WITH_MODULES_TRUE@am_coders_hald_la_rpath = -rpath $(codersdir) +coders_hdr_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) +am_coders_hdr_la_OBJECTS = coders/coders_hdr_la-hdr.lo +coders_hdr_la_OBJECTS = $(am_coders_hdr_la_OBJECTS) +coders_hdr_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(coders_hdr_la_LDFLAGS) $(LDFLAGS) -o $@ +@WITH_MODULES_TRUE@am_coders_hdr_la_rpath = -rpath $(codersdir) coders_histogram_la_DEPENDENCIES = $(MAGICKCORE_LIBS) am_coders_histogram_la_OBJECTS = \ coders/coders_histogram_la-histogram.lo @@ -1417,7 +1424,7 @@ am__magick_libMagickCore_la_SOURCES_DIST = magick/ImageMagick.h \ coders/cmyk.c coders/cut.c coders/dcm.c coders/dds.c \ coders/debug.c coders/dib.c coders/dng.c coders/dot.c \ coders/dpx.c coders/fax.c coders/fits.c coders/gif.c \ - coders/gradient.c coders/gray.c coders/hald.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 \ @@ -1584,6 +1591,7 @@ am__objects_16 = coders/magick_libMagickCore_la-aai.lo \ coders/magick_libMagickCore_la-gradient.lo \ coders/magick_libMagickCore_la-gray.lo \ coders/magick_libMagickCore_la-hald.lo \ + coders/magick_libMagickCore_la-hdr.lo \ coders/magick_libMagickCore_la-histogram.lo \ coders/magick_libMagickCore_la-hrz.lo \ coders/magick_libMagickCore_la-html.lo \ @@ -1971,53 +1979,53 @@ SOURCES = $(Magick___lib_libMagick___la_SOURCES) \ $(coders_fax_la_SOURCES) $(coders_fits_la_SOURCES) \ $(coders_fpx_la_SOURCES) $(coders_gif_la_SOURCES) \ $(coders_gradient_la_SOURCES) $(coders_gray_la_SOURCES) \ - $(coders_hald_la_SOURCES) $(coders_histogram_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_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_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_libMagickCore_la_SOURCES) \ + $(coders_hald_la_SOURCES) $(coders_hdr_la_SOURCES) \ + $(coders_histogram_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_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_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_libMagickCore_la_SOURCES) \ $(wand_libMagickWand_la_SOURCES) \ $(Magick___demo_analyze_SOURCES) \ $(Magick___demo_button_SOURCES) $(Magick___demo_demo_SOURCES) \ @@ -2061,52 +2069,53 @@ DIST_SOURCES = $(Magick___lib_libMagick___la_SOURCES) \ $(coders_fax_la_SOURCES) $(coders_fits_la_SOURCES) \ $(coders_fpx_la_SOURCES) $(coders_gif_la_SOURCES) \ $(coders_gradient_la_SOURCES) $(coders_gray_la_SOURCES) \ - $(coders_hald_la_SOURCES) $(coders_histogram_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_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_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) \ + $(coders_hald_la_SOURCES) $(coders_hdr_la_SOURCES) \ + $(coders_histogram_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_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_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) \ $(am__magick_libMagickCore_la_SOURCES_DIST) \ $(wand_libMagickWand_la_SOURCES) \ $(Magick___demo_analyze_SOURCES) \ @@ -2321,7 +2330,6 @@ GVCDecodeDelegate = @GVCDecodeDelegate@ GVC_CFLAGS = @GVC_CFLAGS@ GVC_LIBS = @GVC_LIBS@ GnuplotDecodeDelegate = @GnuplotDecodeDelegate@ -HDRDecodeDelegate = @HDRDecodeDelegate@ HPGLDecodeDelegate = @HPGLDecodeDelegate@ HTMLDecodeDelegate = @HTMLDecodeDelegate@ ILBMDecodeDelegate = @ILBMDecodeDelegate@ @@ -2865,6 +2873,7 @@ MAGICK_CODER_SRCS = \ coders/gradient.c \ coders/gray.c \ coders/hald.c \ + coders/hdr.c \ coders/histogram.c \ coders/hrz.c \ coders/html.c \ @@ -2980,6 +2989,7 @@ MAGICK_CODER_SRCS = \ @WITH_MODULES_TRUE@ coders/gradient.la \ @WITH_MODULES_TRUE@ coders/gray.la \ @WITH_MODULES_TRUE@ coders/hald.la \ +@WITH_MODULES_TRUE@ coders/hdr.la \ @WITH_MODULES_TRUE@ coders/histogram.la \ @WITH_MODULES_TRUE@ coders/hrz.la \ @WITH_MODULES_TRUE@ coders/html.la \ @@ -3272,6 +3282,12 @@ coders_hald_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_hald_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_hald_la_LIBADD = $(MAGICKCORE_LIBS) $(GOMP_LIBS) +# HDR coder module +coders_hdr_la_SOURCES = coders/hdr.c +coders_hdr_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) +coders_hdr_la_LDFLAGS = $(MODULECOMMONFLAGS) +coders_hdr_la_LIBADD = $(MAGICKCORE_LIBS) $(GOMP_LIBS) + # HRZ coder module coders_hrz_la_SOURCES = coders/hrz.c coders_hrz_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) @@ -5128,6 +5144,10 @@ coders/coders_hald_la-hald.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) coders/hald.la: $(coders_hald_la_OBJECTS) $(coders_hald_la_DEPENDENCIES) coders/$(am__dirstamp) $(AM_V_CCLD)$(coders_hald_la_LINK) $(am_coders_hald_la_rpath) $(coders_hald_la_OBJECTS) $(coders_hald_la_LIBADD) $(LIBS) +coders/coders_hdr_la-hdr.lo: coders/$(am__dirstamp) \ + coders/$(DEPDIR)/$(am__dirstamp) +coders/hdr.la: $(coders_hdr_la_OBJECTS) $(coders_hdr_la_DEPENDENCIES) coders/$(am__dirstamp) + $(AM_V_CCLD)$(coders_hdr_la_LINK) $(am_coders_hdr_la_rpath) $(coders_hdr_la_OBJECTS) $(coders_hdr_la_LIBADD) $(LIBS) coders/coders_histogram_la-histogram.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) coders/histogram.la: $(coders_histogram_la_OBJECTS) $(coders_histogram_la_DEPENDENCIES) coders/$(am__dirstamp) @@ -5769,6 +5789,8 @@ coders/magick_libMagickCore_la-gray.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) coders/magick_libMagickCore_la-hald.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) +coders/magick_libMagickCore_la-hdr.lo: coders/$(am__dirstamp) \ + coders/$(DEPDIR)/$(am__dirstamp) coders/magick_libMagickCore_la-histogram.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) coders/magick_libMagickCore_la-hrz.lo: coders/$(am__dirstamp) \ @@ -6412,6 +6434,8 @@ mostlyclean-compile: -rm -f coders/coders_gray_la-gray.lo -rm -f coders/coders_hald_la-hald.$(OBJEXT) -rm -f coders/coders_hald_la-hald.lo + -rm -f coders/coders_hdr_la-hdr.$(OBJEXT) + -rm -f coders/coders_hdr_la-hdr.lo -rm -f coders/coders_histogram_la-histogram.$(OBJEXT) -rm -f coders/coders_histogram_la-histogram.lo -rm -f coders/coders_hrz_la-hrz.$(OBJEXT) @@ -6642,6 +6666,8 @@ mostlyclean-compile: -rm -f coders/magick_libMagickCore_la-gray.lo -rm -f coders/magick_libMagickCore_la-hald.$(OBJEXT) -rm -f coders/magick_libMagickCore_la-hald.lo + -rm -f coders/magick_libMagickCore_la-hdr.$(OBJEXT) + -rm -f coders/magick_libMagickCore_la-hdr.lo -rm -f coders/magick_libMagickCore_la-histogram.$(OBJEXT) -rm -f coders/magick_libMagickCore_la-histogram.lo -rm -f coders/magick_libMagickCore_la-hrz.$(OBJEXT) @@ -7154,6 +7180,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_gradient_la-gradient.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_gray_la-gray.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_hald_la-hald.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_hdr_la-hdr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_histogram_la-histogram.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_hrz_la-hrz.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_html_la-html.Plo@am__quote@ @@ -7269,6 +7296,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-gradient.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-gray.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-hald.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-hdr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-histogram.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-hrz.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-html.Plo@am__quote@ @@ -7787,6 +7815,14 @@ coders/coders_hald_la-hald.lo: coders/hald.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_hald_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_hald_la-hald.lo `test -f 'coders/hald.c' || echo '$(srcdir)/'`coders/hald.c +coders/coders_hdr_la-hdr.lo: coders/hdr.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_hdr_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_hdr_la-hdr.lo -MD -MP -MF coders/$(DEPDIR)/coders_hdr_la-hdr.Tpo -c -o coders/coders_hdr_la-hdr.lo `test -f 'coders/hdr.c' || echo '$(srcdir)/'`coders/hdr.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_hdr_la-hdr.Tpo coders/$(DEPDIR)/coders_hdr_la-hdr.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/hdr.c' object='coders/coders_hdr_la-hdr.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_hdr_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_hdr_la-hdr.lo `test -f 'coders/hdr.c' || echo '$(srcdir)/'`coders/hdr.c + coders/coders_histogram_la-histogram.lo: coders/histogram.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_histogram_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_histogram_la-histogram.lo -MD -MP -MF coders/$(DEPDIR)/coders_histogram_la-histogram.Tpo -c -o coders/coders_histogram_la-histogram.lo `test -f 'coders/histogram.c' || echo '$(srcdir)/'`coders/histogram.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_histogram_la-histogram.Tpo coders/$(DEPDIR)/coders_histogram_la-histogram.Plo @@ -9475,6 +9511,14 @@ coders/magick_libMagickCore_la-hald.lo: coders/hald.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-hald.lo `test -f 'coders/hald.c' || echo '$(srcdir)/'`coders/hald.c +coders/magick_libMagickCore_la-hdr.lo: coders/hdr.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-hdr.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-hdr.Tpo -c -o coders/magick_libMagickCore_la-hdr.lo `test -f 'coders/hdr.c' || echo '$(srcdir)/'`coders/hdr.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-hdr.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-hdr.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/hdr.c' object='coders/magick_libMagickCore_la-hdr.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-hdr.lo `test -f 'coders/hdr.c' || echo '$(srcdir)/'`coders/hdr.c + coders/magick_libMagickCore_la-histogram.lo: coders/histogram.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-histogram.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-histogram.Tpo -c -o coders/magick_libMagickCore_la-histogram.lo `test -f 'coders/histogram.c' || echo '$(srcdir)/'`coders/histogram.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-histogram.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-histogram.Plo diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index 7cccf49be4..db344b7a7b 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -158,7 +158,7 @@ foreach my $delegate (@tested_delegates) { # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile my $INC_magick = '-I../ -I.. -pthread -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"'; my $LIBS_magick = '-L../magick/.libs -lMagickCore -lperl -lm'; -my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -pthread"; +my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -I/usr/include/python3.1 -Wall -pthread"; my $LDFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'ldflags'} "; my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'} "; @@ -228,7 +228,7 @@ WriteMakefile # 'OPTIMIZE' => '', # Use same compiler as ImageMagick - 'PERLMAINCC' => ' ', + 'PERLMAINCC' => ' -fopenmp', # Set Perl installation prefix to ImageMagick installation prefix # 'PREFIX' => '/usr/local', diff --git a/coders/Makefile.am b/coders/Makefile.am index 8879f21abc..4bd8188e94 100644 --- a/coders/Makefile.am +++ b/coders/Makefile.am @@ -104,6 +104,7 @@ MAGICK_CODER_SRCS = \ coders/gradient.c \ coders/gray.c \ coders/hald.c \ + coders/hdr.c \ coders/histogram.c \ coders/hrz.c \ coders/html.c \ @@ -219,6 +220,7 @@ coders_LTLIBRARIES = \ coders/gradient.la \ coders/gray.la \ coders/hald.la \ + coders/hdr.la \ coders/histogram.la \ coders/hrz.la \ coders/html.la \ @@ -513,6 +515,12 @@ coders_hald_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_hald_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_hald_la_LIBADD = $(MAGICKCORE_LIBS) $(GOMP_LIBS) +# HDR coder module +coders_hdr_la_SOURCES = coders/hdr.c +coders_hdr_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) +coders_hdr_la_LDFLAGS = $(MODULECOMMONFLAGS) +coders_hdr_la_LIBADD = $(MAGICKCORE_LIBS) $(GOMP_LIBS) + # HRZ coder module coders_hrz_la_SOURCES = coders/hrz.c coders_hrz_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) diff --git a/coders/hdr.c b/coders/hdr.c new file mode 100644 index 0000000000..1e0052a66f --- /dev/null +++ b/coders/hdr.c @@ -0,0 +1,283 @@ +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% H H DDDD RRRR % +% H H D D R R % +% HHHHH D D RRRR % +% H H D D R R % +% H H DDDD R R % +% % +% % +% Read/Write HDR RGBE Format % +% % +% Software Design % +% John Cristy % +% July 1992 % +% % +% % +% Copyright 1999-2011 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 "magick/studio.h" +#include "magick/blob.h" +#include "magick/blob-private.h" +#include "magick/cache.h" +#include "magick/colorspace.h" +#include "magick/exception.h" +#include "magick/exception-private.h" +#include "magick/image.h" +#include "magick/image-private.h" +#include "magick/list.h" +#include "magick/magick.h" +#include "magick/memory_.h" +#include "magick/monitor.h" +#include "magick/monitor-private.h" +#include "magick/quantum-private.h" +#include "magick/static.h" +#include "magick/string_.h" +#include "magick/module.h" + +/* + Forward declarations. +*/ +static MagickBooleanType + WriteHDRImage(const ImageInfo *,Image *); + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% R e a d H D R I m a g e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% ReadHDRImage() reads an HDR RGBE 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 ReadHDRImage method is: +% +% Image *ReadHDRImage(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 *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception) +{ + Image + *image; + + MagickBooleanType + status; + + register ssize_t + x; + + register PixelPacket + *q; + + register unsigned char + *p; + + size_t + height, + length, + width; + + ssize_t + count, + y; + + unsigned char + *pixels; + + /* + Open image file. + */ + assert(image_info != (const ImageInfo *) NULL); + assert(image_info->signature == MagickSignature); + if (image_info->debug != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); + assert(exception != (ExceptionInfo *) NULL); + assert(exception->signature == MagickSignature); + image=AcquireImage(image_info); + status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); + if (status == MagickFalse) + { + image=DestroyImageList(image); + return((Image *) NULL); + } + /* + Read HDR X image. + */ + width=ReadBlobMSBLong(image); + height=ReadBlobMSBLong(image); + if (EOFBlob(image) != MagickFalse) + ThrowReaderException(CorruptImageError,"ImproperImageHeader"); + if ((width == 0UL) || (height == 0UL)) + ThrowReaderException(CorruptImageError,"ImproperImageHeader"); + do + { + /* + Convert HDR raster image to pixel packets. + */ + image->columns=width; + image->rows=height; + image->depth=8; + if ((image_info->ping != MagickFalse) && (image_info->number_scenes != 0)) + if (image->scene >= (image_info->scene+image_info->number_scenes-1)) + break; + pixels=(unsigned char *) AcquireQuantumMemory(image->columns, + 4*sizeof(*pixels)); + if (pixels == (unsigned char *) NULL) + ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); + length=(size_t) 4*image->columns; + for (y=0; y < (ssize_t) image->rows; y++) + { + count=ReadBlob(image,length,pixels); + if ((size_t) count != length) + ThrowReaderException(CorruptImageError,"UnableToReadImageData"); + p=pixels; + q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); + if (q == (PixelPacket *) NULL) + break; + for (x=0; x < (ssize_t) image->columns; x++) + { + q->opacity=(Quantum) (QuantumRange-ScaleCharToQuantum(*p++)); + q->red=ScaleCharToQuantum(*p++); + q->green=ScaleCharToQuantum(*p++); + q->blue=ScaleCharToQuantum(*p++); + if (q->opacity != OpaqueOpacity) + image->matte=MagickTrue; + q++; + } + if (SyncAuthenticPixels(image,exception) == MagickFalse) + break; + if ((image->previous == (Image *) NULL) && + (SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)) + break; + } + pixels=(unsigned char *) RelinquishMagickMemory(pixels); + if (EOFBlob(image) != MagickFalse) + { + ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", + image->filename); + break; + } + /* + Proceed to next image. + */ + if (image_info->number_scenes != 0) + if (image->scene >= (image_info->scene+image_info->number_scenes-1)) + break; + width=ReadBlobMSBLong(image); + height=ReadBlobMSBLong(image); + if ((width != 0UL) && (height != 0UL)) + { + /* + Allocate next image structure. + */ + AcquireNextImage(image_info,image); + if (GetNextImageInList(image) == (Image *) NULL) + { + image=DestroyImageList(image); + return((Image *) NULL); + } + image=SyncNextImageInList(image); + status=SetImageProgress(image,LoadImagesTag,TellBlob(image), + GetBlobSize(image)); + if (status == MagickFalse) + break; + } + } while ((width != 0UL) && (height != 0UL)); + (void) CloseBlob(image); + return(GetFirstImageInList(image)); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% R e g i s t e r H D R I m a g e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% RegisterHDRImage() adds attributes for the HDR RGBE 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 RegisterHDRImage method is: +% +% size_t RegisterHDRImage(void) +% +*/ +ModuleExport size_t RegisterHDRImage(void) +{ + MagickInfo + *entry; + + entry=SetMagickInfo("HDR"); + entry->decoder=(DecodeImageHandler *) ReadHDRImage; + entry->encoder=(EncodeImageHandler *) WriteHDRImage; + entry->description=ConstantString("HDR RGBE image"); + entry->module=ConstantString("HDR"); + (void) RegisterMagickInfo(entry); + return(MagickImageCoderSignature); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% U n r e g i s t e r H D R I m a g e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% UnregisterHDRImage() removes format registrations made by the +% HDR module from the list of supported formats. +% +% The format of the UnregisterHDRImage method is: +% +% UnregisterHDRImage(void) +% +*/ +ModuleExport void UnregisterHDRImage(void) +{ + (void) UnregisterMagickInfo("HDR"); +} diff --git a/config/configure.xml b/config/configure.xml index 7aa3d3b3b1..0bc08d5a33 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,20 +10,20 @@ - + - + - + - - + + diff --git a/config/delegates.xml b/config/delegates.xml index a7d6f3fa5d..4388107049 100644 --- a/config/delegates.xml +++ b/config/delegates.xml @@ -72,7 +72,6 @@ - @@ -88,7 +87,6 @@ - @@ -100,7 +98,6 @@ - diff --git a/config/delegates.xml.in b/config/delegates.xml.in index 55fab8bca2..f75d3aad69 100644 --- a/config/delegates.xml.in +++ b/config/delegates.xml.in @@ -72,7 +72,6 @@ - @@ -88,7 +87,6 @@ - @@ -100,7 +98,6 @@ - diff --git a/configure b/configure index 2675ca6aaf..dee9fecd37 100755 --- a/configure +++ b/configure @@ -706,7 +706,6 @@ ILBMEncodeDelegate ILBMDecodeDelegate HTMLDecodeDelegate HPGLDecodeDelegate -HDRDecodeDelegate GnuplotDecodeDelegate MogrifyDelegate DisplayDelegate @@ -30410,7 +30409,6 @@ ConvertDelegateDefault=`echo convert | sed ${configure_transform_name}` DisplayDelegateDefault=`echo display | sed ${configure_transform_name}` MogrifyDelegateDefault=`echo mogrify | sed ${configure_transform_name}` GnuplotDecodeDelegateDefault='gnuplot' -HDRDecodeDelegateDefault='ra_pfm' HPGLDecodeDelegateDefault='hp2xx' HTMLDecodeDelegateDefault='html2ps' ILBMDecodeDelegateDefault='ilbmtoppm' @@ -31104,47 +31102,6 @@ $as_echo "no" >&6; } fi -# Extract the first word of ""$HDRDecodeDelegateDefault"", so it can be a program name with args. -set dummy "$HDRDecodeDelegateDefault"; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_HDRDecodeDelegate+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $HDRDecodeDelegate in - [\\/]* | ?:[\\/]*) - ac_cv_path_HDRDecodeDelegate="$HDRDecodeDelegate" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_HDRDecodeDelegate="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_HDRDecodeDelegate" && ac_cv_path_HDRDecodeDelegate=""$HDRDecodeDelegateDefault"" - ;; -esac -fi -HDRDecodeDelegate=$ac_cv_path_HDRDecodeDelegate -if test -n "$HDRDecodeDelegate"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HDRDecodeDelegate" >&5 -$as_echo "$HDRDecodeDelegate" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - # Extract the first word of ""$HPGLDecodeDelegateDefault"", so it can be a program name with args. set dummy "$HPGLDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -32362,7 +32319,6 @@ have_ilbmtoppm='no' ; if test "$ILBMDecodeDelegate" != "$ILBMDecodeDelegateDefa have_mrsid='no'; if test "$MrSIDDecodeDelegate" != "$MrSIDDecodeDelegateDefault" ; then have_mrsid='yes'; fi have_pcl='no' ; if test "$PCLDelegate" != "$PCLDelegateDefault"; then have_pcl='yes'; fi have_ppmtoilbm='no' ; if test "$ILBMEncodeDelegate" != "$ILBMEncodeDelegateDefault" ; then have_ppmtoilbm='yes'; fi -have_ra_pfm='no' ; if test "$HDRDecodeDelegate" != "$HDRDecodeDelegateDefault" ; then have_ra_pfm='yes'; fi have_ralcgm='no' ; if test "$CGMDecodeDelegate" != "$CGMDecodeDelegateDefault" ; then have_ralcgm='yes'; fi have_xps='no' ; if test "$XPSDelegate" != "$XPSDelegateDefault"; then have_xps='yes'; fi @@ -32502,7 +32458,6 @@ if test "$with_frozenpaths" != 'yes'; then PGPDecodeDelegate="$PGPDecodeDelegateDefault" POVDelegate="$POVDelegateDefault" PSDelegate="$PSDelegateDefault" - HDRDecodeDelegate="$HDRDecodeDelegateDefault" RLEEncodeDelegate="$RLEEncodeDelegateDefault" RMDelegate="$RMDelegateDefault" RSVGDecodeDelegate="$RSVGDecodeDelegateDefault" @@ -32559,7 +32514,6 @@ fi - # diff --git a/configure.ac b/configure.ac index 9ef4dfdb73..553ab6be0f 100755 --- a/configure.ac +++ b/configure.ac @@ -2767,7 +2767,6 @@ ConvertDelegateDefault=`echo convert | sed ${configure_transform_name}` DisplayDelegateDefault=`echo display | sed ${configure_transform_name}` MogrifyDelegateDefault=`echo mogrify | sed ${configure_transform_name}` GnuplotDecodeDelegateDefault='gnuplot' -HDRDecodeDelegateDefault='ra_pfm' HPGLDecodeDelegateDefault='hp2xx' HTMLDecodeDelegateDefault='html2ps' ILBMDecodeDelegateDefault='ilbmtoppm' @@ -2821,7 +2820,6 @@ AC_PATH_PROG(ConvertDelegate, "$ConvertDelegateDefault", "$ConvertDelegateDefaul AC_PATH_PROG(DisplayDelegate, "$DisplayDelegateDefault", "$DisplayDelegateDefault") AC_PATH_PROG(MogrifyDelegate, "$MogrifyDelegateDefault", "$MogrifyDelegateDefault") AC_PATH_PROG(GnuplotDecodeDelegate, "$GnuplotDecodeDelegateDefault", "$GnuplotDecodeDelegateDefault") -AC_PATH_PROG(HDRDecodeDelegate, "$HDRDecodeDelegateDefault", "$HDRDecodeDelegateDefault") AC_PATH_PROG(HPGLDecodeDelegate, "$HPGLDecodeDelegateDefault", "$HPGLDecodeDelegateDefault") AC_PATH_PROG(HTMLDecodeDelegate, "$HTMLDecodeDelegateDefault", "$HTMLDecodeDelegateDefault") AC_PATH_PROG(ILBMDecodeDelegate, "$ILBMDecodeDelegateDefault", "$ILBMDecodeDelegateDefault") @@ -2874,7 +2872,6 @@ have_ilbmtoppm='no' ; if test "$ILBMDecodeDelegate" != "$ILBMDecodeDelegateDefa have_mrsid='no'; if test "$MrSIDDecodeDelegate" != "$MrSIDDecodeDelegateDefault" ; then have_mrsid='yes'; fi have_pcl='no' ; if test "$PCLDelegate" != "$PCLDelegateDefault"; then have_pcl='yes'; fi have_ppmtoilbm='no' ; if test "$ILBMEncodeDelegate" != "$ILBMEncodeDelegateDefault" ; then have_ppmtoilbm='yes'; fi -have_ra_pfm='no' ; if test "$HDRDecodeDelegate" != "$HDRDecodeDelegateDefault" ; then have_ra_pfm='yes'; fi have_ralcgm='no' ; if test "$CGMDecodeDelegate" != "$CGMDecodeDelegateDefault" ; then have_ralcgm='yes'; fi have_xps='no' ; if test "$XPSDelegate" != "$XPSDelegateDefault"; then have_xps='yes'; fi @@ -3008,7 +3005,6 @@ if test "$with_frozenpaths" != 'yes'; then PGPDecodeDelegate="$PGPDecodeDelegateDefault" POVDelegate="$POVDelegateDefault" PSDelegate="$PSDelegateDefault" - HDRDecodeDelegate="$HDRDecodeDelegateDefault" RLEEncodeDelegate="$RLEEncodeDelegateDefault" RMDelegate="$RMDelegateDefault" RSVGDecodeDelegate="$RSVGDecodeDelegateDefault" @@ -3037,7 +3033,6 @@ AC_SUBST(EchoDelegate) AC_SUBST(EditorDelegate) AC_SUBST(FIGDecodeDelegate) AC_SUBST(GnuplotDecodeDelegate) -AC_SUBST(HDRDecodeDelegate) AC_SUBST(HPGLDecodeDelegate) AC_SUBST(HTMLDecodeDelegate) AC_SUBST(ILBMDecodeDelegate) diff --git a/libtool b/libtool index ad6800fb14..01d63e9e86 100755 --- a/libtool +++ b/libtool @@ -164,7 +164,7 @@ lock_old_archive_extraction=no LTCC="gcc -std=gnu99 -std=gnu99" # LTCC compiler flags. -LTCFLAGS="-fopenmp -g -O2 -Wall -pthread" +LTCFLAGS="-fopenmp -I/usr/include/python3.1 -Wall -pthread" # Take the output of nm and produce a listing of raw symbols and C names. global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'" @@ -10220,7 +10220,7 @@ compiler_lib_search_dirs="/usr/lib/gcc/x86_64-redhat-linux/4.6.0 /usr/lib/gcc/x8 predep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.6.0/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.6.0/crtbeginS.o" postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.6.0/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/4.6.0/../../../../lib64/crtn.o" predeps="" -postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s" +postdeps="-lstdc++ -lm -lgcc_s -lpthread -lc -lgcc_s" # The library search path used internally by the compiler when linking # a shared library. diff --git a/magick/ImageMagick.pc b/magick/ImageMagick.pc index 0f8c18d12f..51909fa838 100644 --- a/magick/ImageMagick.pc +++ b/magick/ImageMagick.pc @@ -7,4 +7,4 @@ Name: ImageMagick Description: ImageMagick - Convert, Edit, and Compose Images Version: 6.6.8 Libs: -L${libdir} -lMagickCore -Cflags: -I${includedir} +Cflags: -I${includedir} -fopenmp diff --git a/magick/Magick-config b/magick/Magick-config index 879bbd2c01..4f5a427989 100755 --- a/magick/Magick-config +++ b/magick/Magick-config @@ -40,10 +40,10 @@ while test $# -gt 0; do echo '6.6.8 Q16 ' ;; --cflags) - echo "-I${includedir} " + echo "-I${includedir} -fopenmp" ;; --cxxflags) - echo '-g -O2' + echo '-g -O2 -pthread' ;; --cppflags) echo '-I/usr/local/include/ImageMagick' diff --git a/magick/static.c b/magick/static.c index ad7aaa18b8..6e5f00cbfb 100644 --- a/magick/static.c +++ b/magick/static.c @@ -211,6 +211,9 @@ MagickExport void RegisterStaticModules(void) (void) RegisterGIFImage(); (void) RegisterGRAYImage(); (void) RegisterGRADIENTImage(); + (void) RegisterHALDIMAGEImage(); + (void) RegisterHDRIMAGEImage(); + (void) RegisterHIMAGEImage(); (void) RegisterHISTOGRAMImage(); (void) RegisterHRZImage(); (void) RegisterHTMLImage(); @@ -381,6 +384,9 @@ MagickExport void UnregisterStaticModules(void) UnregisterGIFImage(); UnregisterGRAYImage(); UnregisterGRADIENTImage(); + UnregisterHALDImage(); + UnregisterHDRImage(); + UnregisterHImage(); UnregisterHISTOGRAMImage(); UnregisterHRZImage(); UnregisterHTMLImage(); diff --git a/magick/static.h b/magick/static.h index 16bbebf79d..99e43745e4 100644 --- a/magick/static.h +++ b/magick/static.h @@ -69,6 +69,8 @@ extern ModuleExport size_t RegisterGRADIENTImage(void), RegisterGRANITEImage(void), RegisterGRAYImage(void), + RegisterHALDImage(void), + RegisterHDRImage(void), RegisterHImage(void), RegisterHISTOGRAMImage(void), RegisterHRZImage(void), @@ -219,6 +221,8 @@ extern ModuleExport void UnregisterGRADIENTImage(void), UnregisterGRANITEImage(void), UnregisterGRAYImage(void), + UnregisterHALDImage(void), + UnregisterHDRImage(void), UnregisterHImage(void), UnregisterHISTOGRAMImage(void), UnregisterHRZImage(void), diff --git a/wand/Wand-config b/wand/Wand-config index ae5c84bfe4..632b31182e 100755 --- a/wand/Wand-config +++ b/wand/Wand-config @@ -40,10 +40,10 @@ while test $# -gt 0; do echo '6.6.8 Q16 ' ;; --cflags) - echo "-I${includedir} " + echo "-I${includedir} -fopenmp" ;; --cxxflags) - echo '-g -O2' + echo '-g -O2 -pthread' ;; --cppflags) echo '-I/usr/local/include/ImageMagick' diff --git a/wand/Wand.pc b/wand/Wand.pc index f59e7f52c7..eb70bd0f71 100644 --- a/wand/Wand.pc +++ b/wand/Wand.pc @@ -8,4 +8,4 @@ Version: 6.6.8 Description: MagickWand - C API for ImageMagick Requires: ImageMagick Libs: -L${libdir} -lMagickWand -lMagickCore -Cflags: -I${includedir} +Cflags: -I${includedir} -fopenmp