60 lines
2.0 KiB
Diff
60 lines
2.0 KiB
Diff
From 2720bba09c35fee63c811152132a1582687a93f9 Mon Sep 17 00:00:00 2001
|
|
From: "david.seguela" <david.seguela@delair-tech.com>
|
|
Date: Wed, 24 May 2017 17:26:08 +0200
|
|
Subject: [PATCH] windows compatibility and image magick
|
|
|
|
---
|
|
configure.ac | 4 ++--
|
|
zbar/processor/win.c | 4 ++--
|
|
zbarimg/zbarimg.c | 2 +-
|
|
4 files changed, 33 insertions(+), 33 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 56d3dd0..dd76332 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -336,7 +336,7 @@
|
|
dnl double check ImageMagick install (bug #2582232)
|
|
CPPFLAGS_save="$CPPFLAGS"
|
|
CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS"
|
|
- AC_CHECK_HEADER([wand/MagickWand.h],
|
|
+ AC_CHECK_HEADER([MagickWand/MagickWand.h],
|
|
[have_IM="yes"],
|
|
[have_IM="broken"])
|
|
CPPFLAGS="$CPPFLAGS_save"])])
|
|
diff --git a/zbar/processor/win.c b/zbar/processor/win.c
|
|
index 46844d3..5b5d021 100644
|
|
--- a/zbar/processor/win.c
|
|
+++ b/zbar/processor/win.c
|
|
@@ -117,12 +117,12 @@ static LRESULT CALLBACK win_handle_event (HWND hwnd,
|
|
LPARAM lparam)
|
|
{
|
|
zbar_processor_t *proc =
|
|
- (zbar_processor_t*)GetWindowLongPtr(hwnd, GWL_USERDATA);
|
|
+ (zbar_processor_t*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
|
|
/* initialized during window creation */
|
|
if(message == WM_NCCREATE) {
|
|
proc = ((LPCREATESTRUCT)lparam)->lpCreateParams;
|
|
assert(proc);
|
|
- SetWindowLongPtr(hwnd, GWL_USERDATA, (LONG_PTR)proc);
|
|
+ SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)proc);
|
|
proc->display = hwnd;
|
|
|
|
zbar_window_attach(proc->window, proc->display, proc->xwin);
|
|
diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c
|
|
index 5d2db34..a6bc2d1 100644
|
|
--- a/zbarimg/zbarimg.c
|
|
+++ b/zbarimg/zbarimg.c
|
|
@@ -42,7 +42,7 @@
|
|
#endif
|
|
|
|
#ifdef HAVE_IMAGEMAGICK
|
|
-# include <wand/MagickWand.h>
|
|
+# include <MagickWand/MagickWand.h>
|
|
|
|
/* ImageMagick frequently changes API names - just use the original
|
|
* (more stable?) names to match GraphicsMagick
|
|
--
|
|
2.12.1
|
|
|