From 6ee633d80ed0f5aaa0bcafa0bc2f45b7520b2f0b Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 20 Nov 2000 17:47:15 +0000
Subject: [PATCH] *** empty log message ***

---
 panda/src/pnmimage/pnmImage.cxx           |  4 ++++
 pandatool/src/stitchbase/layeredImage.cxx | 16 ++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/panda/src/pnmimage/pnmImage.cxx b/panda/src/pnmimage/pnmImage.cxx
index eff8057faf..4757ccb47e 100644
--- a/panda/src/pnmimage/pnmImage.cxx
+++ b/panda/src/pnmimage/pnmImage.cxx
@@ -6,6 +6,7 @@
 #include "pnmImage.h"
 #include "pnmReader.h"
 #include "pnmWriter.h"
+#include "config_pnmimage.h"
 
 extern "C" {
 #include "../pnm/pnm.h"
@@ -399,6 +400,9 @@ get_channel_val(int x, int y, int channel) const {
     return get_alpha_val(x, y);
 
   default:
+    pnmimage_cat.error()
+      << "Invalid request for channel " << channel << " in "
+      << get_num_channels() << "-channel image.\n";
     nassertr(false, 0);
     return 0;
   }
diff --git a/pandatool/src/stitchbase/layeredImage.cxx b/pandatool/src/stitchbase/layeredImage.cxx
index 5302549b67..92dd04bf3d 100644
--- a/pandatool/src/stitchbase/layeredImage.cxx
+++ b/pandatool/src/stitchbase/layeredImage.cxx
@@ -53,39 +53,39 @@ get_nlevels() const {
 
 int LayeredImage::TileManager::
 get_level_width(int level) const {
-  assert(level >= 0 && level < _levels.size());
+  assert(level >= 0 && level < (int)_levels.size());
   return _levels[level]._width;
 }
 
 int LayeredImage::TileManager::
 get_level_height(int level) const {
-  assert(level >= 0 && level < _levels.size());
+  assert(level >= 0 && level < (int)_levels.size());
   return _levels[level]._height;
 }
 
 int LayeredImage::TileManager::
 get_ntiles(int level) const {
-  assert(level >= 0 && level < _levels.size());
+  assert(level >= 0 && level < (int)_levels.size());
   return _levels[level]._ntile_rows * _levels[level]._ntile_cols;
 }
 
 int LayeredImage::TileManager::
 get_tile_left(int level, int tile) const {
-  int ntile_rows = _levels[level]._ntile_rows;
+  //  int ntile_rows = _levels[level]._ntile_rows;
   int ntile_cols = _levels[level]._ntile_cols;
 
-  int r = tile / ntile_cols;
+  //  int r = tile / ntile_cols;
   int c = tile % ntile_cols;
   return c * TILE_WIDTH;
 }
 
 int LayeredImage::TileManager::
 get_tile_top(int level, int tile) const {
-  int ntile_rows = _levels[level]._ntile_rows;
+  //  int ntile_rows = _levels[level]._ntile_rows;
   int ntile_cols = _levels[level]._ntile_cols;
 
   int r = tile / ntile_cols;
-  int c = tile % ntile_cols;
+  //  int c = tile % ntile_cols;
   return r * TILE_HEIGHT;
 }
 
@@ -728,7 +728,7 @@ xcf_save_tile(const LayeredImage::TileManager &tm, int level, int tile) {
     int i = 0;
     for (int y = yoff; y < yoff + ysize; y++) {
       for (int x = xoff; x < xoff + xsize; x++) {
-	array[i++] = tm._data->get_channel_val(tm._channel, x, y);
+	array[i++] = tm._data->get_channel_val(x, y, tm._channel);
       }
     }
     assert(i == size);