moving Portable Bitmap reader to classic

src/Classic/Utilities/CMakeLists.txt

@@ -20,6 +20,7 @@ set (_SRCS
   OverflowError.cpp
   ParseError.cpp
   ClassicRandom.cpp
+  PortableBitmapReader.cpp
   RingSection.cpp
   SingularMatrixError.cpp
   SizeError.cpp
@@ -55,6 +56,7 @@ set (HDRS
     OptionTypes.h
     OverflowError.h
     ParseError.h
+    PortableBitmapReader.h
     RingSection.h
     SingularMatrixError.h
     SizeError.h

src/Utilities/CMakeLists.txt

@@ -2,7 +2,6 @@ set (_SRCS
   OpalException.cpp
   OpalFilter.cpp
   OpalSection.cpp
-  PortableBitmapReader.cpp
   RegularExpression.cpp
   Round.cpp
   Timer.cpp
@@ -21,7 +20,6 @@ set (HDRS
     OpalException.h
     OpalFilter.h
     OpalSection.h
-    PortableBitmapReader.h
     RegularExpression.h
     Round.h
     Timer.h

tests/classic_src/Utilities/CMakeLists.txt

 set (_SRCS
+    PortableBitmapReaderTest.cpp
     RingSectionTest.cpp
   )
 

tests/opal_src/Utilities/PortableBitmapReaderTest.cpp → tests/classic_src/Utilities/PortableBitmapReaderTest.cpp

@@ -10,7 +10,7 @@ TEST(PBMReaderTest, SimpleAsciiTest) {
     OpalTestUtilities::SilenceTest silencer;
 
     std::string opalSourcePath = OPAL_SOURCE_DIR;
-    std::string pathToBitmapFile = opalSourcePath + "/tests/opal_src/Utilities/Untitled.pbm";
+    std::string pathToBitmapFile = opalSourcePath + "/tests/classic_src/Utilities/Untitled.pbm";
     PortableBitmapReader reader(pathToBitmapFile);
 
     bool pixel = reader.isBlack(111, 300);
@@ -33,7 +33,7 @@ TEST(PBMReaderTest, SimpleBinaryTest) {
     OpalTestUtilities::SilenceTest silencer;
 
     std::string opalSourcePath = OPAL_SOURCE_DIR;
-    std::string pathToBitmapFile = opalSourcePath + "/tests/opal_src/Utilities/Untitled_binary.pbm";
+    std::string pathToBitmapFile = opalSourcePath + "/tests/classic_src/Utilities/Untitled_binary.pbm";
     PortableBitmapReader reader(pathToBitmapFile);
 
     bool pixel = reader.isBlack(111, 300);

tests/opal_src/Utilities/CMakeLists.txt

 set (_SRCS
-    PortableBitmapReaderTest.cpp
   )
 
 include_directories (