Tru64 UNIX patches for 1.1.2

Patches needed for Tru64 UNIX 4.0D and 5.1.

1. [Magick++/demo/Makefile.am, Magick++/tests/Makefile.am]
   -I../../magick makes <list> bring in ../../magick/list.h
2. [Magick++/tests/readWriteBlob.cpp]
   a) You 'use namespace std' so you don't need std::ifstream
   b) ios::binary doesn't exist on this platform. Problem for Windows?

-- 
albert chin ([email protected])

-- snip snip
--- Magick++/demo/Makefile.am.orig	2004-07-22 14:13:44.626974000 -0500
+++ Magick++/demo/Makefile.am	2004-07-22 14:46:16.666472000 -0500
@@ -3,7 +3,7 @@
 #
 # Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002, 2003
 #
-AUTOMAKE_OPTIONS = 1.8 foreign
+AUTOMAKE_OPTIONS = 1.8 foreign nostdinc
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/Magick++/lib -I$(top_srcdir)
 
--- Magick++/tests/Makefile.am.orig	2004-07-22 14:06:00.288757000 -0500
+++ Magick++/tests/Makefile.am	2004-07-22 14:46:13.004868000 -0500
@@ -3,7 +3,7 @@
 #
 # Copyright Bob Friesenhahn, 1999, 2000, 2002, 2004
 #
-AUTOMAKE_OPTIONS = 1.8 foreign
+AUTOMAKE_OPTIONS = 1.8 foreign nostdinc
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/Magick++/lib -I$(top_srcdir)
 
--- Magick++/tests/readWriteBlob.cpp.orig	2004-07-22 14:08:31.440349000 -0500
+++ Magick++/tests/readWriteBlob.cpp	2004-07-22 14:14:28.245370000 -0500
@@ -19,7 +19,7 @@
 {
 public:
   // Construct from open binary stream
-  myBlob( std::ifstream &stream_ )
+  myBlob( ifstream &stream_ )
     : Blob()
     {
       unsigned char* blobData = new unsigned char[100000];
@@ -71,7 +71,7 @@
 
         // Read raw data from file into BLOB
         testimage = srcdir + "test_image.miff";
-        ifstream in( testimage.c_str(), ios::in | ios::binary );
+        ifstream in( testimage.c_str(), ios::in );
         if( !in )
           {
             cout << "Failed to open file " << testimage << " for input!" << endl;
@@ -203,7 +203,7 @@
 
         // Read raw data from file into BLOB
         testimage = srcdir + "test_image.miff";
-        ifstream in( testimage.c_str(), ios::in | ios::binary );
+        ifstream in( testimage.c_str(), ios::in );
         if( !in )
           {
             cout << "Failed to open file for input!" << endl;


-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click