From 0d2018c16c62a9b46e9b29e63ea9e6e374de6438 Mon Sep 17 00:00:00 2001 From: castano Date: Wed, 5 Mar 2008 19:17:06 +0000 Subject: [PATCH] Merge copy ctor bug reported by Richard Sim. Update ChangeLog. --- branches/2.0/ChangeLog | 5 ++++- branches/2.0/src/nvimage/Image.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/branches/2.0/ChangeLog b/branches/2.0/ChangeLog index e7cec91..227d86f 100644 --- a/branches/2.0/ChangeLog +++ b/branches/2.0/ChangeLog @@ -1,7 +1,10 @@ +NVIDIA Texture Tools version 2.0.2 + * Fix copy ctor error reported by Richard Sim. + NVIDIA Texture Tools version 2.0.1 * Fix memory leaks. * Pre-allocate device memory for CUDA compressor. - * Add single color compressor. + * Add single color compressor. Thanks to Amir Ebrahimi. * Better CUDA error checking. NVIDIA Texture Tools version 2.0.0 diff --git a/branches/2.0/src/nvimage/Image.cpp b/branches/2.0/src/nvimage/Image.cpp index 6b4eac8..53c0b5f 100644 --- a/branches/2.0/src/nvimage/Image.cpp +++ b/branches/2.0/src/nvimage/Image.cpp @@ -15,7 +15,7 @@ Image::Image() : m_width(0), m_height(0), m_format(Format_RGB), m_data(NULL) { } -Image::Image(const Image & img) +Image::Image(const Image & img) : m_data(NULL) { allocate(img.m_width, img.m_height); m_format = img.m_format;