TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 16:20:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
David Rose 2000-11-20 17:47:15 +00:00
parent dea0ca9d21
commit 6ee633d80e
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/pnmimage/pnmImage.cxx
View File

@ -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;
}

16
pandatool/src/stitchbase/layeredImage.cxx
View File

@ -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);