From 53fee65d08081b7259e143b01c0edbbc89572e75 Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 14 Apr 2003 17:11:56 +0000 Subject: [PATCH] better asserts --- panda/src/pnmimage/pnmImage.I | 1 + panda/src/pnmimage/pnmImage.cxx | 2 ++ 2 files changed, 3 insertions(+) diff --git a/panda/src/pnmimage/pnmImage.I b/panda/src/pnmimage/pnmImage.I index f8bdfc528d..7aced53f27 100644 --- a/panda/src/pnmimage/pnmImage.I +++ b/panda/src/pnmimage/pnmImage.I @@ -192,6 +192,7 @@ is_valid() const { //////////////////////////////////////////////////////////////////// INLINE void PNMImage:: set_num_channels(int num_channels) { + nassertv(num_channels >= 1 && num_channels <= 4); set_color_type((ColorType)num_channels); } diff --git a/panda/src/pnmimage/pnmImage.cxx b/panda/src/pnmimage/pnmImage.cxx index 4aa57b8eff..8eafe3a7ca 100644 --- a/panda/src/pnmimage/pnmImage.cxx +++ b/panda/src/pnmimage/pnmImage.cxx @@ -54,6 +54,7 @@ void PNMImage:: clear(int x_size, int y_size, int num_channels, xelval maxval, PNMFileType *type) { clear(); + nassertv(num_channels >= 1 && num_channels <= 4); _x_size = x_size; _y_size = y_size; @@ -273,6 +274,7 @@ write(PNMWriter *writer) const { //////////////////////////////////////////////////////////////////// void PNMImage:: set_color_type(PNMImage::ColorType color_type) { + nassertv((int)color_type >= 1 && (int)color_type <= 4); if (color_type == get_color_type()) { return; }