Browse Source

better asserts

David Rose 23 years ago
parent
commit
53fee65d08
2 changed files with 3 additions and 0 deletions
  1. 1 0
      panda/src/pnmimage/pnmImage.I
  2. 2 0
      panda/src/pnmimage/pnmImage.cxx

+ 1 - 0
panda/src/pnmimage/pnmImage.I

@@ -192,6 +192,7 @@ is_valid() const {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 INLINE void PNMImage::
 INLINE void PNMImage::
 set_num_channels(int num_channels) {
 set_num_channels(int num_channels) {
+  nassertv(num_channels >= 1 && num_channels <= 4);
   set_color_type((ColorType)num_channels);
   set_color_type((ColorType)num_channels);
 }
 }
 
 

+ 2 - 0
panda/src/pnmimage/pnmImage.cxx

@@ -54,6 +54,7 @@ void PNMImage::
 clear(int x_size, int y_size, int num_channels,
 clear(int x_size, int y_size, int num_channels,
       xelval maxval, PNMFileType *type) {
       xelval maxval, PNMFileType *type) {
   clear();
   clear();
+  nassertv(num_channels >= 1 && num_channels <= 4);
 
 
   _x_size = x_size;
   _x_size = x_size;
   _y_size = y_size;
   _y_size = y_size;
@@ -273,6 +274,7 @@ write(PNMWriter *writer) const {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 void PNMImage::
 void PNMImage::
 set_color_type(PNMImage::ColorType color_type) {
 set_color_type(PNMImage::ColorType color_type) {
+  nassertv((int)color_type >= 1 && (int)color_type <= 4);
   if (color_type == get_color_type()) {
   if (color_type == get_color_type()) {
     return;
     return;
   }
   }