From 860b6394921ee0ebebbc3976e189f05a006ac1af Mon Sep 17 00:00:00 2001 From: Ignacio Date: Sat, 4 Apr 2020 10:40:58 -0700 Subject: [PATCH] Remove unused code. --- src/nvimage/ColorBlock.cpp | 13 ------------- src/nvimage/ColorBlock.h | 5 ----- src/nvtt/CompressorDXT1.h | 1 - 3 files changed, 19 deletions(-) diff --git a/src/nvimage/ColorBlock.cpp b/src/nvimage/ColorBlock.cpp index e111243..3f04307 100644 --- a/src/nvimage/ColorBlock.cpp +++ b/src/nvimage/ColorBlock.cpp @@ -1,8 +1,6 @@ // This code is in the public domain -- castanyo@yahoo.es #include "ColorBlock.h" -#include "Image.h" -#include "FloatImage.h" #include "nvmath/Box.h" #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) { nvDebugCheck(data != NULL); diff --git a/src/nvimage/ColorBlock.h b/src/nvimage/ColorBlock.h index f87cb6d..597d69d 100644 --- a/src/nvimage/ColorBlock.h +++ b/src/nvimage/ColorBlock.h @@ -9,9 +9,6 @@ namespace nv { - class Image; - class FloatImage; - /// Uncompressed 4x4 color block. struct ColorBlock @@ -19,9 +16,7 @@ namespace nv ColorBlock(); ColorBlock(const uint * linearImage); 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 float * data, uint x, uint y); diff --git a/src/nvtt/CompressorDXT1.h b/src/nvtt/CompressorDXT1.h index 97aa5a5..bd1422c 100644 --- a/src/nvtt/CompressorDXT1.h +++ b/src/nvtt/CompressorDXT1.h @@ -2,7 +2,6 @@ namespace nv { class Color32; - struct ColorBlock; struct BlockDXT1; class Vector3; class Vector4;