From 68a4031b220395c827cd3f60e2a4b4c4ecd340e8 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Tue, 21 Jan 2020 15:36:48 +0100
Subject: [PATCH] pnmimagetypes: unexpose PNMFileType* classes

They are not exposed to Python, and I cannot think of a good reason to use these classes directly in C++ code.

Call init_libpnmimagetypes() to register these classes with the PNMFileTypeRegistry instead.
---
 panda/src/pnmimagetypes/pnmFileTypeBMP.h       | 2 +-
 panda/src/pnmimagetypes/pnmFileTypeEXR.h       | 2 +-
 panda/src/pnmimagetypes/pnmFileTypeIMG.h       | 2 +-
 panda/src/pnmimagetypes/pnmFileTypeJPG.h       | 2 +-
 panda/src/pnmimagetypes/pnmFileTypePNG.h       | 2 +-
 panda/src/pnmimagetypes/pnmFileTypePNM.h       | 2 +-
 panda/src/pnmimagetypes/pnmFileTypePfm.h       | 2 +-
 panda/src/pnmimagetypes/pnmFileTypeSGI.h       | 2 +-
 panda/src/pnmimagetypes/pnmFileTypeSoftImage.h | 2 +-
 panda/src/pnmimagetypes/pnmFileTypeStbImage.h  | 2 +-
 panda/src/pnmimagetypes/pnmFileTypeTGA.h       | 3 +--
 panda/src/pnmimagetypes/pnmFileTypeTIFF.h      | 2 +-
 12 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/panda/src/pnmimagetypes/pnmFileTypeBMP.h b/panda/src/pnmimagetypes/pnmFileTypeBMP.h
index 6cd3e8e32f..1777699bcd 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeBMP.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeBMP.h
@@ -25,7 +25,7 @@
 /**
  * For reading and writing Windows BMP files.
  */
-class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeBMP : public PNMFileType {
+class PNMFileTypeBMP : public PNMFileType {
 public:
   PNMFileTypeBMP();
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeEXR.h b/panda/src/pnmimagetypes/pnmFileTypeEXR.h
index 75a2b000e9..23e211ee98 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeEXR.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeEXR.h
@@ -36,7 +36,7 @@ class ImfStdIstream;
 /**
  * For reading and writing EXR floating-point or integer files.
  */
-class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeEXR : public PNMFileType {
+class PNMFileTypeEXR : public PNMFileType {
 public:
   PNMFileTypeEXR();
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeIMG.h b/panda/src/pnmimagetypes/pnmFileTypeIMG.h
index 2c406dfa68..e75aaeb972 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeIMG.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeIMG.h
@@ -25,7 +25,7 @@
 /**
  * For reading and writing headerless R,G,B files.
  */
-class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeIMG : public PNMFileType {
+class PNMFileTypeIMG : public PNMFileType {
 public:
   PNMFileTypeIMG();
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeJPG.h b/panda/src/pnmimagetypes/pnmFileTypeJPG.h
index f851c6d226..d577e52bf6 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeJPG.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeJPG.h
@@ -55,7 +55,7 @@ extern "C" {
 /**
  * For reading and writing Jpeg files.
  */
-class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeJPG : public PNMFileType {
+class PNMFileTypeJPG : public PNMFileType {
 public:
   PNMFileTypeJPG();
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypePNG.h b/panda/src/pnmimagetypes/pnmFileTypePNG.h
index 3c1df88cbc..535a5b2f43 100644
--- a/panda/src/pnmimagetypes/pnmFileTypePNG.h
+++ b/panda/src/pnmimagetypes/pnmFileTypePNG.h
@@ -28,7 +28,7 @@
 /**
  * For reading and writing PNG files.
  */
-class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypePNG : public PNMFileType {
+class PNMFileTypePNG : public PNMFileType {
 public:
   PNMFileTypePNG();
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypePNM.h b/panda/src/pnmimagetypes/pnmFileTypePNM.h
index 1c65c19109..811661b1fa 100644
--- a/panda/src/pnmimagetypes/pnmFileTypePNM.h
+++ b/panda/src/pnmimagetypes/pnmFileTypePNM.h
@@ -25,7 +25,7 @@
 /**
  * For reading and writing basic PNM files--*.pbm, *.ppm, *.pnm.
  */
-class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypePNM : public PNMFileType {
+class PNMFileTypePNM : public PNMFileType {
 public:
   PNMFileTypePNM();
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypePfm.h b/panda/src/pnmimagetypes/pnmFileTypePfm.h
index ab18685084..c97ec46eb6 100644
--- a/panda/src/pnmimagetypes/pnmFileTypePfm.h
+++ b/panda/src/pnmimagetypes/pnmFileTypePfm.h
@@ -25,7 +25,7 @@
  * For reading and writing PFM files using the basic PNMImage interface, as if
  * they were basic RGB files.
  */
-class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypePfm : public PNMFileType {
+class PNMFileTypePfm : public PNMFileType {
 public:
   PNMFileTypePfm();
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeSGI.h b/panda/src/pnmimagetypes/pnmFileTypeSGI.h
index ff026a3740..dbced028e2 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeSGI.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeSGI.h
@@ -25,7 +25,7 @@
 /**
  * For reading and writing SGI RGB files.
  */
-class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeSGI : public PNMFileType {
+class PNMFileTypeSGI : public PNMFileType {
 public:
   PNMFileTypeSGI();
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeSoftImage.h b/panda/src/pnmimagetypes/pnmFileTypeSoftImage.h
index c6e6860621..55457bbfca 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeSoftImage.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeSoftImage.h
@@ -25,7 +25,7 @@
 /**
  * For reading and SoftImage native image files.
  */
-class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeSoftImage : public PNMFileType {
+class PNMFileTypeSoftImage : public PNMFileType {
 public:
   PNMFileTypeSoftImage();
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeStbImage.h b/panda/src/pnmimagetypes/pnmFileTypeStbImage.h
index ce7d2d55ea..260d6dc61c 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeStbImage.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeStbImage.h
@@ -27,7 +27,7 @@
  * when compiling without support for more specific libraries that are more
  * full-featured, such as libpng or libjpeg.
  */
-class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeStbImage : public PNMFileType {
+class PNMFileTypeStbImage : public PNMFileType {
 public:
   PNMFileTypeStbImage();
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeTGA.h b/panda/src/pnmimagetypes/pnmFileTypeTGA.h
index c50a09ed47..d4ce1426cd 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeTGA.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeTGA.h
@@ -26,11 +26,10 @@
 
 struct ImageHeader;
 
-
 /**
  * For reading and writing Targa image files.
  */
-class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeTGA : public PNMFileType {
+class PNMFileTypeTGA : public PNMFileType {
 public:
   PNMFileTypeTGA();
 
diff --git a/panda/src/pnmimagetypes/pnmFileTypeTIFF.h b/panda/src/pnmimagetypes/pnmFileTypeTIFF.h
index c61e4f53f1..36148a082e 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeTIFF.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeTIFF.h
@@ -30,7 +30,7 @@
 /**
  * For reading and writing TIFF files.
  */
-class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeTIFF : public PNMFileType {
+class PNMFileTypeTIFF : public PNMFileType {
 public:
   PNMFileTypeTIFF();