Remove unused code.

pull/312/head
Ignacio 4 years ago
parent 52e065d66a
commit 860b639492

@ -1,8 +1,6 @@
// This code is in the public domain -- castanyo@yahoo.es // This code is in the public domain -- castanyo@yahoo.es
#include "ColorBlock.h" #include "ColorBlock.h"
#include "Image.h"
#include "FloatImage.h"
#include "nvmath/Box.h" #include "nvmath/Box.h"
#include "nvmath/Vector.inl" #include "nvmath/Vector.inl"
@ -53,17 +51,6 @@ ColorBlock::ColorBlock(const ColorBlock & block)
} }
/// Initialize this color block.
ColorBlock::ColorBlock(const Image * img, uint x, uint y)
{
init(img, x, y);
}
void ColorBlock::init(const Image * img, uint x, uint y)
{
init(img->width, img->height, (const uint *)img->pixels(), x, y);
}
void ColorBlock::init(uint w, uint h, const uint * data, uint x, uint y) void ColorBlock::init(uint w, uint h, const uint * data, uint x, uint y)
{ {
nvDebugCheck(data != NULL); nvDebugCheck(data != NULL);

@ -9,9 +9,6 @@
namespace nv namespace nv
{ {
class Image;
class FloatImage;
/// Uncompressed 4x4 color block. /// Uncompressed 4x4 color block.
struct ColorBlock struct ColorBlock
@ -19,9 +16,7 @@ namespace nv
ColorBlock(); ColorBlock();
ColorBlock(const uint * linearImage); ColorBlock(const uint * linearImage);
ColorBlock(const ColorBlock & block); ColorBlock(const ColorBlock & block);
ColorBlock(const Image * img, uint x, uint y);
void init(const Image * img, uint x, uint y);
void init(uint w, uint h, const uint * data, uint x, uint y); void init(uint w, uint h, const uint * data, uint x, uint y);
void init(uint w, uint h, const float * data, uint x, uint y); void init(uint w, uint h, const float * data, uint x, uint y);

@ -2,7 +2,6 @@
namespace nv { namespace nv {
class Color32; class Color32;
struct ColorBlock;
struct BlockDXT1; struct BlockDXT1;
class Vector3; class Vector3;
class Vector4; class Vector4;

Loading…
Cancel
Save