Use a default photometric interpretation value of PHOTOMETRIC_MINISWHITE instead...

[wxWidgets.git] / tests / archive / archivetest.cpp

diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp
index 04fdb902a2e2106152194d95475f2075f86527d7..b56777059f4070292bb0e5766ade01513673b818 100644 (file)
--- a/tests/archive/archivetest.cpp
+++ b/tests/archive/archivetest.cpp
@@ -680,7 +680,7 @@ void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out,
         // then load the archive file
         {
             wxFFileInputStream in(tmparc);
         // then load the archive file
         {
             wxFFileInputStream in(tmparc);

-            if (in.Ok())
+            if (in.IsOk())

                 out.Write(in);
         }
 
                 out.Write(in);
         }
 


@@ -690,7 +690,7 @@ void ArchiveTestCase<ClassFactoryT>::CreateArchive(wxOutputStream& out,
         // for the non-seekable test, have the archiver output to "-"
         // and read the archive via a pipe
         PFileInputStream in(wxString::Format(archiver, wxT("-")));
         // for the non-seekable test, have the archiver output to "-"
         // and read the archive via a pipe
         PFileInputStream in(wxString::Format(archiver, wxT("-")));

-        if (in.Ok())
+        if (in.IsOk())

             out.Write(in);
     }
 }
             out.Write(in);
     }
 }


@@ -893,7 +893,7 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in,
         // write the archive to a temporary file
         {
             wxFFileOutputStream out(tmparc);
         // write the archive to a temporary file
         {
             wxFFileOutputStream out(tmparc);

-            if (out.Ok())
+            if (out.IsOk())

                 out.Write(in);
         }
 
                 out.Write(in);
         }
 


@@ -905,7 +905,7 @@ void ArchiveTestCase<ClassFactoryT>::ExtractArchive(wxInputStream& in,
         // for the non-seekable test, have the archiver extract "-" and
         // feed it the archive via a pipe
         PFileOutputStream out(wxString::Format(unarchiver, wxT("-")));
         // for the non-seekable test, have the archiver extract "-" and
         // feed it the archive via a pipe
         PFileOutputStream out(wxString::Format(unarchiver, wxT("-")));

-        if (out.Ok())
+        if (out.IsOk())

             out.Write(in);
     }
 
             out.Write(in);
     }
 


@@ -958,7 +958,7 @@ void ArchiveTestCase<ClassFactoryT>::VerifyDir(wxString& path,
             if (!isDir) {
                 wxFFileInputStream in(path);
                 CPPUNIT_ASSERT_MESSAGE(
             if (!isDir) {
                 wxFFileInputStream in(path);
                 CPPUNIT_ASSERT_MESSAGE(

-                    "entry not found in archive" + error_entry, in.Ok());
+                    "entry not found in archive" + error_entry, in.IsOk());

 
                 size_t size = (size_t)in.GetLength();
                 wxCharBuffer buf(size);
 
                 size_t size = (size_t)in.GetLength();
                 wxCharBuffer buf(size);