-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On Thu, 13 Apr 2000, sam th wrote:
> Well, I spoke slightly too soon. The exact same line is also needed at
> line 238 in gr_UnixImage.cpp
As all you clever folk have surely noticed, this will apply to more than
just the Unix build. :-) Therefore, here is the completed patch, which
takes care of *every* place we use png_ptr->io_ptr in the source tree.
This should finish off this bug (at least until I find the real solution).
Back to debating 0.7.9
sam th
[EMAIL PROTECTED]
http://bur-jud-118-039.rh.uchicago.edu
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.1 (GNU/Linux)
Comment: For info see http://www.gnupg.org
iD8DBQE49iwtt+kM0Mq9M/wRAk0IAKCnn8KNeT0ONSt1/Owes+2uuC8/BwCgzOcT
otNmpW7upoobzAqK067Pdk0=
=J/Q6
-----END PGP SIGNATURE-----
Index: src/af/gr/qnx/gr_QNXImage.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/gr/qnx/gr_QNXImage.cpp,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 gr_QNXImage.cpp
--- src/af/gr/qnx/gr_QNXImage.cpp 2000/01/11 12:06:44 1.1.1.1
+++ src/af/gr/qnx/gr_QNXImage.cpp 2000/04/13 20:13:47
@@ -235,6 +235,8 @@
struct _bb myBB;
myBB.pBB = pBB;
myBB.iCurPos = 0;
+
+ png_ptr->io_ptr = &myBB;
png_set_read_fn(png_ptr, (void *)&myBB, _png_read);
Index: src/af/gr/unix/gr_UnixImage.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/gr/unix/gr_UnixImage.cpp,v
retrieving revision 1.10
diff -u -r1.10 gr_UnixImage.cpp
--- src/af/gr/unix/gr_UnixImage.cpp 1999/05/25 04:09:14 1.10
+++ src/af/gr/unix/gr_UnixImage.cpp 2000/04/13 20:13:47
@@ -235,6 +235,8 @@
myBB.pBB = pBB;
myBB.iCurPos = 0;
+ png_ptr->io_ptr = &myBB;
+
png_set_read_fn(png_ptr, (void *)&myBB, _png_read);
/* The call to png_read_info() gives us all of the information from the
Index: src/af/gr/win/gr_Win32Image.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/gr/win/gr_Win32Image.cpp,v
retrieving revision 1.7
diff -u -r1.7 gr_Win32Image.cpp
--- src/af/gr/win/gr_Win32Image.cpp 1999/05/25 04:09:15 1.7
+++ src/af/gr/win/gr_Win32Image.cpp 2000/04/13 20:13:47
@@ -97,6 +97,8 @@
myBB.pBB = pBB;
myBB.iCurPos = 0;
+ png_ptr->io_ptr = &myBB;
+
png_set_read_fn(png_ptr, (void *)&myBB, _png_read);
/* The call to png_read_info() gives us all of the information from the
Index: src/af/util/xp/ut_png.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/util/xp/ut_png.cpp,v
retrieving revision 1.2
diff -u -r1.2 ut_png.cpp
--- src/af/util/xp/ut_png.cpp 1999/02/19 17:20:25 1.2
+++ src/af/util/xp/ut_png.cpp 2000/04/13 20:13:47
@@ -76,8 +76,11 @@
struct _bb myBB;
myBB.pBB = pBB;
myBB.iCurPos = 0;
-
+
+ png_ptr->io_ptr = &myBB;
png_set_read_fn(png_ptr, (void *)&myBB, _png_read);
+
+
/* The call to png_read_info() gives us all of the information from the
* PNG file before the first IDAT (image data chunk). REQUIRED
Index: src/af/xap/unix/xap_UnixPSImage.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/xap/unix/xap_UnixPSImage.cpp,v
retrieving revision 1.3
diff -u -r1.3 xap_UnixPSImage.cpp
--- src/af/xap/unix/xap_UnixPSImage.cpp 1999/03/25 17:15:48 1.3
+++ src/af/xap/unix/xap_UnixPSImage.cpp 2000/04/13 20:13:47
@@ -114,6 +114,8 @@
struct _bb myBB;
myBB.pBB = pBB;
myBB.iCurPos = 0;
+
+ png_ptr->io_ptr = &myBB;
png_set_read_fn(png_ptr, (void *)&myBB, _png_read);
Index: src/ask/lib/win/ask_lib_Win32.c
===================================================================
RCS file: /cvsroot/abi/src/ask/lib/win/ask_lib_Win32.c,v
retrieving revision 1.8
diff -u -r1.8 ask_lib_Win32.c
--- src/ask/lib/win/ask_lib_Win32.c 1999/07/16 18:27:07 1.8
+++ src/ask/lib/win/ask_lib_Win32.c 2000/04/13 20:13:48
@@ -251,6 +251,8 @@
myBB.pBytes = pBytes;
myBB.iCurPos = 0;
+
+ png_ptr->io_ptr = &myBB;
png_set_read_fn(png_ptr, (void *)&myBB, _png_read);
