Commit: e4f8378bd0b313586a1ac38e565bc321ee1737e2 - color_quantizer (git)

減色プログラム

Commit MetaInfo

• Revisão: e4f8378bd0b313586a1ac38e565bc321ee1737e2 (tree)
• Hora: 2011-05-29 18:52:29
• Autor: berupon <berupon@gmai...>
• Commiter: berupon

Mensagem de Log

scolorqの処理を別ファイルに移動。他の減色処理の実装準備。

Mudança Sumário

• modified: ImageIO/File.cpp
• modified: main.cpp
• delete: quantize.cpp => scolorq.cpp
• delete: quantize.h
• add: scolorq.h
• modified: vs2008/color_quantizer.vcproj
• modified: vs2010/color_quantizer.vcxproj

Diff

--- a/ImageIO/File.cpp
+++ b/ImageIO/File.cpp
@@ -1,4 +1,4 @@
-
+#include "stdafx.h"
 #include "File.h"
 
 #include <io.h>

--- a/main.cpp
+++ b/main.cpp
@@ -1,46 +1,15 @@
 
 // color quantization program by berupon
 
-// original program scolorq
-/* Copyright (c) 2006 Derrick Coetzee
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-
 #include "stdafx.h"
 
-#include <algorithm>
-#include <math.h>
-#include <stdio.h>
-#include <time.h>
 #include <vector>
-#include <deque>
 #include <limits>
-#include <iostream>
 
 #include "ImageIO/ImageIO.h"
 #include "ImageIO/File.h"
 
-#include "quantize.h"
-#include "dxor.h"
+#include "scolorq.h"
 
 // http://proglab.aki.gs/mediaproc/colors.html
 
@@ -48,8 +17,8 @@ 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.bmp> <desired palette size> [dithering level] [filter size (1/3/5)]\n");
+	if (argc != 1+3) {
+		puts("Usage: color_quantizer <source image.bmp> <output image.bmp> <desired palette size>\n");
 		return -1;
 	}
 	
@@ -59,7 +28,6 @@ int _tmain(int argc, _TCHAR* argv[])
 		return -1;
 	}
 	
-	sdxor156(time(NULL));
 	ImageInfo imageInfo;
 	FILE* f = _tfopen(argv[1], _T("rb"));
 	if (!f) {
@@ -111,88 +79,16 @@ int _tmain(int argc, _TCHAR* argv[])
 		pLine += width;
 		pSrcLine += lineBytes;
 	}
-	Color buff_filter1_weights[1*1];
-	Color buff_filter3_weights[3*3];
-	Color buff_filter5_weights[5*5];
-
-	Image filter1_weights(1, 1, buff_filter1_weights);
-	Image filter3_weights(3, 3, buff_filter3_weights);
-	Image filter5_weights(5, 5, buff_filter5_weights);
 	std::vector<uint8_t> buff_quantized(width * height);
 	Array2D<uint8_t> quantized_image(width, height, &buff_quantized[0]);
 	Color palette[256];
 	
-	filter1_weights[0][0] = Color(1.0, 1.0, 1.0, 0.0);
-	
-	for (size_t i=0; i<num_colors; ++i) {
-		palette[i] = Color(
-			dxor156(),
-			dxor156(),
-			dxor156(),
-			0.0
-			);
-	}
-
-	Array3D<double>* coarse_variables;
-	double dithering_level = 0.09*log((double)image.width_*image.height_) - 0.04*log((double)num_colors) + 0.001;
-	if (argc > 1+3) {
-		dithering_level = _ttof(argv[4]); 
-		if (dithering_level <= 0.0) {
-			puts("Dithering level must be more than zero.\n");
-			return -1;
-		}
-	}
-	int filter_size = 3;
-	if (argc > 1+4) {
-		filter_size = _ttoi(argv[5]); 
-		if (filter_size != 1 && filter_size != 3 && filter_size != 5) {
-			puts("Filter size must be one of 1, 3, or 5.\n");
-			return -1;
-		}
-	}
-
-	double stddev = dithering_level;
-	double sum = 0.0;
-	for (int i=0; i<3; i++) {
-		for (int j=0; j<3; j++) {
-			double w = exp(-sqrt((double)((i-1)*(i-1) + (j-1)*(j-1)))/(stddev*stddev));
-			filter3_weights[i][j] = Color(w,w,w,0);
-			sum += w;
-		}
-	}
-	double invSum = 1.0 / sum;
-	for (int i=0; i<3; i++) {
-		for (int j=0; j<3; j++) {
-			filter3_weights[i][j] *= invSum;
-		}
-	}
-	sum = 0.0;
-	for (int i=0; i<5; i++) {
-		for (int j=0; j<5; j++) {
-			double w = exp(-sqrt((double)((i-2)*(i-2) + (j-2)*(j-2)))/(stddev*stddev));
-			filter5_weights[i][j] = Color(w,w,w,0);
-			sum += w;
-		}
-	}
-	invSum = 1.0 / sum;
-	for (int i=0; i<5; i++) {
-		for (int j=0; j<5; j++) {
-			filter5_weights[i][j] *= invSum;
-		}
-	}
-
-	Image* filters[] = {
-		NULL,
-		&filter1_weights,
-		NULL,
-		&filter3_weights,
-		NULL,
-		&filter5_weights
-	};
 
 	DWORD started = ::timeGetTime();
 	
-	spatial_color_quant(image, *filters[filter_size], quantized_image, palette, num_colors, coarse_variables, 1.0, 0.001, 3, 1);
+	if (!scolorq(image, quantized_image, palette, num_colors)) {
+		return -1;
+	}
 	
 	DWORD timeTaken = ::timeGetTime() - started;
 	printf("time taken : %d ms, call count : %d\n", timeTaken, call_count);
@@ -204,15 +100,22 @@ int _tmain(int argc, _TCHAR* argv[])
 			return -1;
 		}
 		File file(out);
+		uint8_t bytePalettes[256][3];
+		for (size_t i=0; i<num_colors; ++i) {
+			Color col = palette[i];
+			bytePalettes[i][0] = (unsigned char)(pow(col[0], gamma) * 255.0);
+			bytePalettes[i][1] = (unsigned char)(pow(col[1], gamma) * 255.0);
+			bytePalettes[i][2] = (unsigned char)(pow(col[2], gamma) * 255.0);
+		}
 		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];
-				*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);
+				const uint8_t* pal = bytePalettes[idx];
+				*pLine++ = pal[0];
+				*pLine++ = pal[1];
+				*pLine++ = pal[2];
 			}
 		}
 		WriteImage(file, imageInfo, &bytes[0], imageInfo.width * 3);

--- a/quantize.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "Array.h"
-#include "Color4d_sse.h"
-//#include "Color4d_avx.h"
-
-typedef Color4d Color;
-typedef Array2D<Color> Image;
-
-void spatial_color_quant(
-	Image& image,
-	Image& filter_weights,
-	Array2D<uint8_t>& quantized_image,
-	Color* palette, size_t num_colors,
-	Array3D<double>*& p_coarse_variables,
-	double initial_temperature,
-	double final_temperature,
-	int temps_per_level,
-	int repeats_per_temp
-);
-

--- a/quantize.cpp
+++ b/scolorq.cpp
@@ -31,7 +31,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "stdafx.h"
 
-#include "quantize.h"
+#include "scolorq.h"
 
 #include <algorithm>
 #include <math.h>
@@ -754,3 +754,83 @@ void spatial_color_quant(
 
 }
 
+bool scolorq(
+	Image& image,
+	Array2D<uint8_t>& quantized_image,
+	Color* palette,
+	size_t num_colors
+	)
+{
+	sdxor156(time(NULL));
+	
+	for (size_t i=0; i<num_colors; ++i) {
+		palette[i] = Color(
+			dxor156(),
+			dxor156(),
+			dxor156(),
+			0.0
+			);
+	}
+	
+	Array3D<double>* coarse_variables;
+	double dithering_level = // 0.09*log((double)image.width_*image.height_) - 0.04*log((double)num_colors) + 0.001;
+		 1.2;
+	if (dithering_level <= 0.0) {
+		puts("Dithering level must be more than zero.\n");
+		return false;
+	}
+	int filter_size = 3;
+	if (filter_size != 1 && filter_size != 3 && filter_size != 5) {
+		puts("Filter size must be one of 1, 3, or 5.\n");
+		return false;
+	}
+	
+	Color buff_filter1_weights[1*1];
+	Color buff_filter3_weights[3*3];
+	Color buff_filter5_weights[5*5];
+	Image filter1_weights(1, 1, buff_filter1_weights);
+	Image filter3_weights(3, 3, buff_filter3_weights);
+	Image filter5_weights(5, 5, buff_filter5_weights);
+	filter1_weights[0][0] = Color(1.0, 1.0, 1.0, 0.0);
+	double stddev = dithering_level;
+	double sum = 0.0;
+	for (int i=0; i<3; i++) {
+		for (int j=0; j<3; j++) {
+			double w = exp(-sqrt((double)((i-1)*(i-1) + (j-1)*(j-1)))/(stddev*stddev));
+			filter3_weights[i][j] = Color(w,w,w,0);
+			sum += w;
+		}
+	}
+	double invSum = 1.0 / sum;
+	for (int i=0; i<3; i++) {
+		for (int j=0; j<3; j++) {
+			filter3_weights[i][j] *= invSum;
+		}
+	}
+	sum = 0.0;
+	for (int i=0; i<5; i++) {
+		for (int j=0; j<5; j++) {
+			double w = exp(-sqrt((double)((i-2)*(i-2) + (j-2)*(j-2)))/(stddev*stddev));
+			filter5_weights[i][j] = Color(w,w,w,0);
+			sum += w;
+		}
+	}
+	invSum = 1.0 / sum;
+	for (int i=0; i<5; i++) {
+		for (int j=0; j<5; j++) {
+			filter5_weights[i][j] *= invSum;
+		}
+	}
+
+	Image* filters[] = {
+		NULL,
+		&filter1_weights,
+		NULL,
+		&filter3_weights,
+		NULL,
+		&filter5_weights
+	};
+
+	spatial_color_quant(image, *filters[filter_size], quantized_image, palette, num_colors, coarse_variables, 1.0, 0.001, 3, 1);
+	return true;
+}

--- /dev/null
+++ b/scolorq.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "Array.h"
+#include "Color4d_sse.h"
+//#include "Color4d_avx.h"
+
+typedef Color4d Color;
+typedef Array2D<Color> Image;
+
+bool scolorq(
+	Image& image,
+	Array2D<uint8_t>& quantized_image,
+	Color* palette,
+	size_t num_colors
+);
+

--- a/vs2008/color_quantizer.vcproj
+++ b/vs2008/color_quantizer.vcproj
@@ -351,7 +351,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\quantize.cpp"
+				RelativePath="..\scolorq.cpp"
 				>
 			</File>
 			<File
@@ -401,7 +401,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\quantize.h"
+				RelativePath="..\scolorq.h"
 				>
 			</File>
 			<File

--- a/vs2010/color_quantizer.vcxproj
+++ b/vs2010/color_quantizer.vcxproj
@@ -94,11 +94,12 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\ImageIO\File.cpp" />
+    <ClCompile Include="..\ImageIO\ImageIO.cpp" />
+    <ClCompile Include="..\ImageIO\ImageIO_bmp.cpp" />
     <ClCompile Include="..\lib.cpp" />
     <ClCompile Include="..\main.cpp" />
-    <ClCompile Include="..\quantize.cpp" />
-    <ClCompile Include="..\ReadImage\File.cpp" />
-    <ClCompile Include="..\ReadImage\ReadImage.cpp" />
+    <ClCompile Include="..\scolorq.cpp" />
     <ClCompile Include="..\stdafx.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -107,10 +108,11 @@
     <ClInclude Include="..\Color4d_sse.h" />
     <ClInclude Include="..\common.h" />
     <ClInclude Include="..\dxor.h" />
-    <ClInclude Include="..\quantize.h" />
-    <ClInclude Include="..\ReadImage\File.h" />
-    <ClInclude Include="..\ReadImage\IFile.h" />
-    <ClInclude Include="..\ReadImage\ReadImage.h" />
+    <ClInclude Include="..\ImageIO\File.h" />
+    <ClInclude Include="..\ImageIO\IFile.h" />
+    <ClInclude Include="..\ImageIO\ImageIO.h" />
+    <ClInclude Include="..\ImageIO\ImageIO_bmp.h" />
+    <ClInclude Include="..\scolorq.h" />
     <ClInclude Include="..\stdafx.h" />
     <ClInclude Include="..\stdint.h" />
     <ClInclude Include="..\targetver.h" />