NyARToolKit

関数宣言のconst指定がいい加減で、gccでのコンパイル時に警告が出ることへの対応です。

機能面での変更はありません。

Index: D:/project.files/vc.Lab/NyARTransMat_C_version/nyar_NyARTransMat.h
===================================================================
--- D:/project.files/vc.Lab/NyARTransMat_C_version/nyar_NyARTransMat.h (revision 202)
+++ D:/project.files/vc.Lab/NyARTransMat_C_version/nyar_NyARTransMat.h (revision 203)
@@ -82,9 +82,9 @@
*/
double nyar_NyARTransMat_O2_transMat(
nyar_NyARTransMat_O2_t* i_inst,
- const ARMarkerInfo* i_marker_info,
- const double center[2],
- const double i_width,
+ ARMarkerInfo* i_marker_info,
+ double center[2],
+ double i_width,
double o_conv[3][4]);

/*!
@@ -107,11 +107,11 @@
*/
double nyar_NyARTransMat_O2_transMatCont(
nyar_NyARTransMat_O2_t* i_inst,
- const ARMarkerInfo* i_marker_info,
- const double i_prev_conv[3][4],
- const double i_center[2],
- const double i_width,
- double o_conv[3][4]);
+ ARMarkerInfo* i_marker_info,
+ double i_prev_conv[3][4],
+ double i_center[2],
+ double i_width,
+ double o_conv[3][4]);

#ifdef __cplusplus
}
Index: D:/project.files/vc.Lab/NyARTransMat_C_version/nyar_NyARTransMat.c
===================================================================
--- D:/project.files/vc.Lab/NyARTransMat_C_version/nyar_NyARTransMat.c (revision 202)
+++ D:/project.files/vc.Lab/NyARTransMat_C_version/nyar_NyARTransMat.c (revision 203)
@@ -590,9 +590,9 @@
#define MD_PI 3.14159265358979323846
static double nyar_NyARTransRot_O3_modifyMatrix(
nyar_NyARTransRot_O3_t* i_inst,
- const double trans[],
- const double vertex[][3],
- const double pos2d[][2])
+ double trans[],
+ double vertex[][3],
+ double pos2d[][2])
{
double factor;
double a2, b2, c2;
@@ -752,7 +752,7 @@

static void nyar_NyARTransRot_O3_initRotByPrevResult(
nyar_NyARTransRot_O3_t* i_inst,
- const double i_prev_result[3][4])
+ double i_prev_result[3][4])
{
double* L_rot=i_inst->array;

@@ -811,16 +811,16 @@

static double nyar_NyARTransMat_O2_arGetTransMatSub(
const nyar_NyARTransMat_O2_t* i_inst,
- const double i_pos2d[][2],
- const double i_pos3d[][3],
+ double i_pos2d[][2],
+ double i_pos3d[][3],
ARMat* i_mat_b,
ARMat* i_mat_d,
double o_trans[]);

static void nyar_NyARTransMat_O2_arGetTransMat3_initTransMat(
nyar_NyARTransMat_O2_t* i_inst,
- const double i_ppos3d[][2],
- const double i_ppos2d[][2],
+ double i_ppos2d[][2],
+ double i_ppos3d[][2],
double o_pos2d[][2],
double o_pos3d[][3],
double o_off[3],
@@ -914,9 +914,9 @@

double nyar_NyARTransMat_O2_transMat(
nyar_NyARTransMat_O2_t* i_inst,
- const ARMarkerInfo* i_marker_info,
- const double i_center[2],
- const double i_width,
+ ARMarkerInfo* i_marker_info,
+ double i_center[2],
+ double i_width,
double o_conv[3][4])
{
double ppos2d[4][2];
@@ -961,11 +961,11 @@

double nyar_NyARTransMat_O2_transMatCont(
nyar_NyARTransMat_O2_t* i_inst,
- const ARMarkerInfo* i_marker_info,
- const double i_prev_conv[3][4],
- const double i_center[2],
- const double i_width,
- double o_conv[3][4])
+ ARMarkerInfo* i_marker_info,
+ double i_prev_conv[3][4],
+ double i_center[2],
+ double i_width,
+ double o_conv[3][4])
/*
double nyar_NyARTransMat_O2_transMatCont(
NyARSquare i_square,int i_direction, double i_width,NyARTransMatResult io_result_conv)throws NyARException*/
@@ -1034,8 +1034,8 @@
*/
static void nyar_NyARTransMat_O2_arGetTransMat3_initTransMat(
nyar_NyARTransMat_O2_t* i_inst,
- const double i_ppos2d[][2],
- const double i_ppos3d[][2],
+ double i_ppos2d[][2],
+ double i_ppos3d[][2],
double o_pos2d[][2],
double o_pos3d[][3],
double o_off[3],
@@ -1111,8 +1111,8 @@

static double nyar_NyARTransMat_O2_arGetTransMatSub(
const nyar_NyARTransMat_O2_t* i_inst,
- const double i_pos2d[][2],
- const double i_pos3d[][3],
+ double i_pos2d[][2],
+ double i_pos3d[][3],
ARMat* i_mat_b,
ARMat* i_mat_d,
double o_trans[])