Commit: 96481f8cc65d486c61adae5a17f7a16fb6cd3c40 - color_quantizer (git)

減色プログラム

Commit MetaInfo

• Revision: 96481f8cc65d486c61adae5a17f7a16fb6cd3c40 (tree)
• Time: 2011-05-29 17:03:27
• Author: berupon <berupon@gmai...>
• Commiter: berupon

Log Message

確認がし易いように出力ファイルフォーマットをRAWからBMPに変更。

Change Summary

• add: ImageIO/ImageIO.cpp
• add: ImageIO/ImageIO.h
• delete: ReadImage/ReadImage.cpp
• delete: ReadImage/ReadImage.h
• modified: main.cpp
• modified: vs2008/color_quantizer.vcproj
• modified: vs2010/color_quantizer.vcxproj
• delete: {ReadImage => ImageIO}/File.cpp
• delete: {ReadImage => ImageIO}/File.h
• delete: {ReadImage => ImageIO}/IFile.h

Incremental Difference

--- /dev/null
+++ b/ImageIO/ImageIO.cpp
@@ -0,0 +1,19 @@
+#include "stdafx.h"
+
+#include "ImageIO_bmp.h"
+
+bool ReadImageInfo(IFile& file, ImageInfo& info)
+{
+	return ReadImageInfo_bmp(file, info);
+}
+
+bool ReadImage(IFile& file, ImageInfo& info, void* dest, int lineOffset, void* palettes)
+{
+	return ReadImage_bmp(file, info, dest, lineOffset, palettes);
+}
+
+bool WriteImage(IFile& file, const ImageInfo& info, const void* data, int lineOffset)
+{
+	return WriteImage_bmp(file, info, data, lineOffset);
+}
+

--- /dev/null
+++ b/ImageIO/ImageIO.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "IFile.h"
+
+enum ImageFileFormatType {
+	ImageFileFormatType_Unknown,
+	ImageFileFormatType_BMP,
+	ImageFileFormatType_PNG,
+};
+
+struct ImageInfo
+{
+	ImageFileFormatType fileFormatType;
+	size_t width;
+	size_t height;
+	size_t bitsPerSample;
+	size_t samplesPerPixel;
+};
+
+bool ReadImageInfo(IFile& file, ImageInfo& info);
+bool ReadImage(IFile& file, ImageInfo& info, void* dest, int lineOffset, void* palettes);
+
+bool WriteImage(IFile& file, const ImageInfo& info, const void* data, int lineOffset);
+

--- a/ReadImage/ReadImage.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-
-#include "ReadImage.h"
-
-#include <stdio.h>
-#define TRACE printf
-#include <assert.h>
-
-#include <windows.h>
-
-bool Read_BITMAPINFOHEADER(IFile& file, BITMAPINFOHEADER& bmih)
-{
-	size_t fileSize = file.Size();
-	if (fileSize <= 54) {
-		TRACE("file size <= 54 bytes.");
-		return false;
-	}
-	BITMAPFILEHEADER bmpFileHeader;
-	size_t readBytes = 0;
-	file.Read(&bmpFileHeader, 14, readBytes);
-	assert(readBytes == 14);
-	if (bmpFileHeader.bfType != 19778) {
-		TRACE("file hedear bfType != 19778");
-		return false;
-	}
-	
-	file.Read(&bmih, 40, readBytes);
-	if (readBytes != 40) {
-		TRACE("bmih shortage.");
-		return false;
-	}
-	
-	return true;
-}
-
-bool ReadImageInfo_BMP(IFile& file, ImageInfo& info)
-{
-	BITMAPINFOHEADER bmih;
-	if (!Read_BITMAPINFOHEADER(file, bmih)) {
-		return false;
-	}
-	info.width = bmih.biWidth;
-	info.height = bmih.biHeight;
-	switch (bmih.biBitCount) {
-	case 1:
-	case 2:
-	case 4:
-		return false;
-		break;
-	case 8:
-		info.bitsPerSample = 8;
-		info.samplesPerPixel = 1;
-		break;
-	case 16:
-		return false;
-	case 24:
-		info.bitsPerSample = 8;
-		info.samplesPerPixel = 3;
-		break;
-	case 32:
-		info.bitsPerSample = 8;
-		info.samplesPerPixel = 4;
-		break;
-	}
-	return true;
-}
-
-bool ReadImageData_BMP(IFile& file, unsigned char* dest, int lineOffset, void* palettes)
-{
-	file.Seek(0, FILE_BEGIN);
-	BITMAPINFOHEADER bmih;
-	if (!Read_BITMAPINFOHEADER(file, bmih)) {
-		return false;
-	}
-	size_t bmiColorsLen = 0;
-	switch (bmih.biBitCount) {
-	case 1:
-		bmiColorsLen = 2;
-		break;
-	case 4:
-		bmiColorsLen = 16;
-		break;
-	case 8:
-		bmiColorsLen = 256;
-		break;
-	case 16:
-		TRACE("16 bit BMP not supported.");
-		return false;
-		break;
-	case 32:
-		if (bmih.biCompression == BI_BITFIELDS) {
-			bmiColorsLen = 3;
-		}
-	}
-	size_t readBytes = 0;
-	if (bmiColorsLen) {
-		size_t needBytes = /*sizeof(RGBQUAD)*/4*bmiColorsLen;
-		file.Read(palettes, needBytes, readBytes);
-		if (readBytes != needBytes) {
-			TRACE("bmiColors read failed.");
-			return false;
-		}
-	}
-	const int lineBytes = ((((bmih.biWidth * bmih.biBitCount) + 31) & ~31) >> 3);
-	const int lineIdx = (bmih.biHeight < 0) ? 0 : (bmih.biHeight-1);
-	OffsetPtr(dest, lineOffset * lineIdx);
-	lineOffset *= (bmih.biHeight < 0) ? 1 : -1;
-
-	const size_t height = abs(bmih.biHeight);
-	for (size_t y=0; y<height; ++y) {
-		file.Read(dest, lineBytes, readBytes);
-		if (readBytes != lineBytes) {
-			TRACE("read bytes != lineBytes.");
-			return false;
-		}
-		OffsetPtr(dest, lineOffset);
-	}
-	
-	return true;
-}
-
-bool ReadImageInfo(IFile& file, ImageInfo& info)
-{
-	return ReadImageInfo_BMP(file, info);
-}
-
-bool ReadImageData(IFile& file, unsigned char* dest, int lineOffset, void* palettes)
-{
-	return ReadImageData_BMP(file, dest, lineOffset, palettes);
-}
-

--- a/ReadImage/ReadImage.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "IFile.h"
-
-struct ImageInfo
-{
-	size_t width;
-	size_t height;
-	size_t bitsPerSample;
-	size_t samplesPerPixel;
-};
-
-bool ReadImageInfo(IFile& file, ImageInfo& info);
-bool ReadImageData(IFile& file, unsigned char* dest, int lineOffset, void* palettes);
-

--- a/main.cpp
+++ b/main.cpp
@@ -36,8 +36,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <limits>
 #include <iostream>
 
-#include "ReadImage/ReadImage.h"
-#include "ReadImage/File.h"
+#include "ImageIO/ImageIO.h"
+#include "ImageIO/File.h"
 
 #include "quantize.h"
 #include "dxor.h"
@@ -49,7 +49,7 @@ size_t call_count = 0;
 int _tmain(int argc, _TCHAR* argv[])
 {
 	if (argc < 1+3 || argc > 1+5) {
-		puts("Usage: color_quantizer <source image.bmp> <output image.raw> <desired palette size> [dithering level] [filter size (1/3/5)]\n");
+		puts("Usage: color_quantizer <source image.bmp> <output image.bmp> <desired palette size> [dithering level] [filter size (1/3/5)]\n");
 		return -1;
 	}
 	
@@ -83,7 +83,7 @@ int _tmain(int argc, _TCHAR* argv[])
 		lineBytes += 4 - (lineBytes % 4);
 	}
 	std::vector<uint8_t> buff(lineBytes * imageInfo.height);
-	ReadImageData(file, &buff[0], lineBytes, 0);
+	ReadImage(file, imageInfo, &buff[0], lineBytes, 0);
 	fclose(f);
 	uint8_t* p = &buff[0];
 	
@@ -92,11 +92,20 @@ int _tmain(int argc, _TCHAR* argv[])
 	Image image(width, height);
 	Color* pLine = image.pBuff_;
 	uint8_t* pSrcLine = p;
+
+	double gamma = 1.0;
+	double lut[256];
+	lut[0] = 0.0;
+	lut[255] = 1.0;
+	for (size_t i=1; i<255; ++i) {
+		lut[i] = pow(i/255.0, 1.0/gamma);
+	}
 	for (size_t y=0; y<height; ++y) {
 		for (size_t x=0; x<width; ++x) {
-			double r = pSrcLine[x*3+0] / 255.0;
-			double g = pSrcLine[x*3+1] / 255.0;
-			double b = pSrcLine[x*3+2] / 255.0;
+			const uint8_t* pPixel = pSrcLine + x * 3;
+			double r = lut[ pPixel[0] ];
+			double g = lut[ pPixel[1] ];
+			double b = lut[ pPixel[2] ];
 			pLine[x] = Color(r,g,b,0.0);
 		}
 		pLine += width;
@@ -194,18 +203,19 @@ int _tmain(int argc, _TCHAR* argv[])
 			printf("Could not open output file '%s'.\n", argv[2]);
 			return -1;
 		}
-		unsigned char c[3] = {0,0,0};
+		File file(out);
+		std::vector<uint8_t> bytes(imageInfo.width * imageInfo.height * 3);
+		uint8_t* pLine = &bytes[0];
 		for (int y=0; y<height; y++) {
 			for (int x=0; x<width; x++) {
 				const uint8_t idx = quantized_image[y][x];
 				Color col = palette[idx];
-				col *= 255.0;
-				c[2] = (unsigned char)(col[0]);
-				c[1] = (unsigned char)(col[1]);
-				c[0] = (unsigned char)(col[2]);
-				fwrite(c, 3, 1, out);
+				*pLine++ = (unsigned char)(pow(col[0], gamma) * 255.0);
+				*pLine++ = (unsigned char)(pow(col[1], gamma) * 255.0);
+				*pLine++ = (unsigned char)(pow(col[2], gamma) * 255.0);
 			}
 		}
+		WriteImage(file, imageInfo, &bytes[0], imageInfo.width * 3);
 		fclose(out);
 	}
 

--- a/vs2008/color_quantizer.vcproj
+++ b/vs2008/color_quantizer.vcproj
@@ -418,58 +418,34 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="ReadImage"
+			Name="ImageIO"
 			>
 			<File
-				RelativePath="..\ReadImage\File.cpp"
+				RelativePath="..\ImageIO\File.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\ReadImage\File.h"
+				RelativePath="..\ImageIO\File.h"
 				>
 			</File>
 			<File
-				RelativePath="..\ReadImage\IFile.h"
+				RelativePath="..\ImageIO\IFile.h"
 				>
 			</File>
 			<File
-				RelativePath="..\ReadImage\ReadImage.cpp"
+				RelativePath="..\ImageIO\ImageIO.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\ImageIO\ImageIO.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ImageIO\ImageIO_bmp.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\ReadImage\ReadImage.h"
+				RelativePath="..\ImageIO\ImageIO_bmp.h"
 				>
 			</File>
 		</Filter>

--- a/vs2010/color_quantizer.vcxproj
+++ b/vs2010/color_quantizer.vcxproj
@@ -79,12 +79,18 @@
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalOptions>/arch:__AVX %(AdditionalOptions)</AdditionalOptions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <ExceptionHandling>false</ExceptionHandling>
+      <FloatingPointExceptions>false</FloatingPointExceptions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <BrowseInformation>true</BrowseInformation>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>