[prev in list] [next in list] [prev in thread] [next in thread] 

List:       graphicsmagick-commit
Subject:    [GM-commit] GraphicsMagick: CropImageToHBITMAP() and ImageToHBITMAP() are de...
From:       GraphicsMagick Commits <graphicsmagick-commit () lists ! sourceforge ! net>
Date:       2020-12-29 23:32:36
Message-ID: mailman.280969.1609284767.1370.graphicsmagick-commit () lists ! sourceforge ! net
[Download RAW message or body]

changeset 0a252b21e156 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=0a252b21e156
                
summary: CropImageToHBITMAP() and ImageToHBITMAP() are dependent on HasWINGDI32.

diffstat:

 ChangeLog           |  3 +++
 configure           |  2 +-
 configure.ac        |  4 ++--
 magick/nt_feature.c |  4 ++++
 magick/nt_feature.h |  4 +++-
 www/Changelog.html  |  2 ++
 6 files changed, 15 insertions(+), 4 deletions(-)

diffs (106 lines):

diff -r 01d44082d479 -r 0a252b21e156 ChangeLog
--- a/ChangeLog	Tue Dec 29 13:58:53 2020 -0600
+++ b/ChangeLog	Tue Dec 29 17:32:31 2020 -0600
@@ -1,5 +1,8 @@
 2020-12-29  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
+	* magick/nt_feature.c (CropImageToHBITMAP): Dependent on HasWINGDI32.
+	(ImageToHBITMAP): Dependent on HasWINGDI32.
+
 	* coders/jp2.c: JasPer changed its jas_stream_ops_t callback
 	interfaces in releases 2.0.19 and 2.0.20.  Provide the newer
 	interfaces by default, but use a MAGICK_JP2_OLD_STREAM_INTERFACE
diff -r 01d44082d479 -r 0a252b21e156 configure
--- a/configure	Tue Dec 29 13:58:53 2020 -0600
+++ b/configure	Tue Dec 29 17:32:31 2020 -0600
@@ -27793,7 +27793,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgdi32 -luser32 $LIBS"
+LIBS="-lgdi32  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff -r 01d44082d479 -r 0a252b21e156 configure.ac
--- a/configure.ac	Tue Dec 29 13:58:53 2020 -0600
+++ b/configure.ac	Tue Dec 29 17:32:31 2020 -0600
@@ -2754,8 +2754,8 @@
   AC_CHECK_HEADER([windows.h],[passed=`expr $passed + 1`],[failed=`expr $failed + \
1`])  AC_CHECK_HEADER([winuser.h],[passed=`expr $passed + 1`],[failed=`expr $failed + \
1`],[#include <windows.h>])  AC_CHECK_HEADER([wingdi.h],[passed=`expr $passed + \
                1`],[failed=`expr $failed + 1`],[#include <windows.h>])
-  AC_CHECK_LIB([user32],[OpenClipboard],[found_libuser32=`expr $found_libuser32 + \
                1`],[],)
-  AC_CHECK_LIB([gdi32],[CreateDIBSection],[found_libgdi32=`expr $found_libgdi32 + \
1`],[],[-luser32]) +  AC_CHECK_LIB([user32],[OpenClipboard],[found_libuser32=`expr \
$found_libuser32 + 1`],[],[]) +  \
AC_CHECK_LIB([gdi32],[CreateDIBSection],[found_libgdi32=`expr $found_libgdi32 + \
1`],[],[])  if test $found_libuser32 -gt 0 -a  $found_libgdi32 -gt 0
   then
     passed=`expr $passed + 1`
diff -r 01d44082d479 -r 0a252b21e156 magick/nt_feature.c
--- a/magick/nt_feature.c	Tue Dec 29 13:58:53 2020 -0600
+++ b/magick/nt_feature.c	Tue Dec 29 17:32:31 2020 -0600
@@ -78,6 +78,7 @@
 %
 %
 */
+#if defined(HasWINGDI32)
 MagickExport void *CropImageToHBITMAP(Image *image,
   const RectangleInfo *geometry,ExceptionInfo *exception)
 {
@@ -217,6 +218,7 @@
 
   return (void *)bitmapH;
 }
+#endif /* if defined(HasWINGDI32) */
 
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -612,6 +614,7 @@
 %
 %
 */
+#if defined(HasWINGDI32)
 MagickExport void *ImageToHBITMAP(Image* image)
 {
   unsigned long
@@ -696,5 +699,6 @@
 
   return (void *)bitmapH;
 }
+#endif /* if defined(HasWINGDI32) */
 
 #endif
diff -r 01d44082d479 -r 0a252b21e156 magick/nt_feature.h
--- a/magick/nt_feature.h	Tue Dec 29 13:58:53 2020 -0600
+++ b/magick/nt_feature.h	Tue Dec 29 17:32:31 2020 -0600
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003 GraphicsMagick Group
+  Copyright (C) 2003-2020 GraphicsMagick Group
   Copyright (C) 2002 ImageMagick Studio
 
   This program is covered by multiple licenses, which are described in
@@ -23,9 +23,11 @@
 extern MagickExport char
   *NTRegistryKeyLookup(const char *key);
 
+#if defined(HasWINGDI32)
 extern MagickExport void
   *CropImageToHBITMAP(Image *,const RectangleInfo *,ExceptionInfo *),
   *ImageToHBITMAP(Image* image);
+#endif /* if defined(HasWINGDI32) */
 
 #if !defined(XS_VERSION)
 
diff -r 01d44082d479 -r 0a252b21e156 www/Changelog.html
--- a/www/Changelog.html	Tue Dec 29 13:58:53 2020 -0600
+++ b/www/Changelog.html	Tue Dec 29 17:32:31 2020 -0600
@@ -38,6 +38,8 @@
 <p>2020-12-29  Bob Friesenhahn  &lt;<a class="reference external" \
href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#6 \
4;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
  <blockquote>
 <ul class="simple">
+<li>magick/nt_feature.c (CropImageToHBITMAP): Dependent on HasWINGDI32.
+(ImageToHBITMAP): Dependent on HasWINGDI32.</li>
 <li>coders/jp2.c: JasPer changed its jas_stream_ops_t callback
 interfaces in releases 2.0.19 and 2.0.20.  Provide the newer
 interfaces by default, but use a MAGICK_JP2_OLD_STREAM_INTERFACE


_______________________________________________
Graphicsmagick-commit mailing list
Graphicsmagick-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/graphicsmagick-commit


[prev in list] [next in list] [prev in thread] [next in thread]