[更新]NyARToolkit

[nyartoolkit-and/nyartoolkit-and.git] / src / jp / nyatla / nyartoolkit / core2 / rasterfilter / rgb2gs / NyARRasterFilter_RgbAve.java

diff --git a/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbAve.java b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbAve.java
index f349e12..4ae85a8 100644 (file)
--- a/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbAve.java
+++ b/src/jp/nyatla/nyartoolkit/core2/rasterfilter/rgb2gs/NyARRasterFilter_RgbAve.java
@@ -46,7 +46,7 @@ public class NyARRasterFilter_RgbAve implements INyARRasterFilter_RgbToGs
                INyARBufferReader out_buffer_reader=i_output.getBufferReader(); \r
                assert (i_input.getSize().isEqualSize(i_output.getSize()) == true);\r
 \r
-               int[][] out_buf = (int[][]) out_buffer_reader.getBuffer();\r
+               int[] out_buf = (int[]) out_buffer_reader.getBuffer();\r
                byte[] in_buf = (byte[]) in_buffer_reader.getBuffer();\r
 \r
                NyARIntSize size = i_output.getSize();\r
@@ -64,23 +64,23 @@ public class NyARRasterFilter_RgbAve implements INyARRasterFilter_RgbToGs
                return;\r
        }\r
 \r
-       private void convert24BitRgb(byte[] i_in, int[][] i_out, NyARIntSize i_size)\r
+       private void convert24BitRgb(byte[] i_in, int[] i_out, NyARIntSize i_size)\r
        {\r
                int bp = 0;\r
                for (int y = 0; y < i_size.h; y++) {\r
                        for (int x = 0; x < i_size.w; x++) {\r
-                               i_out[y][x] = ((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff)) / 3;\r
+                               i_out[y*i_size.w+x] = ((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff)) / 3;\r
                                bp += 3;\r
                        }\r
                }\r
                return;\r
        }\r
-       private void convert32BitRgbx(byte[] i_in, int[][] i_out, NyARIntSize i_size)\r
+       private void convert32BitRgbx(byte[] i_in, int[] i_out, NyARIntSize i_size)\r
        {\r
                int bp = 0;\r
                for (int y = 0; y < i_size.h; y++) {\r
                        for (int x = 0; x < i_size.w; x++) {\r
-                               i_out[y][x] = ((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff)) / 3;\r
+                               i_out[y*i_size.w+x] = ((i_in[bp] & 0xff) + (i_in[bp + 1] & 0xff) + (i_in[bp + 2] & 0xff)) / 3;\r
                                bp += 4;\r
                        }\r
                }\r