• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1950 (tree)
日時2011-05-07 17:18:39
作者satofumi

ログメッセージ

fixed size_t error.

変更サマリ

差分

--- trunk/tools/sh7045writer/FZtatHandler.h (revision 1949)
+++ trunk/tools/sh7045writer/FZtatHandler.h (revision 1950)
@@ -11,6 +11,7 @@
1111 */
1212
1313 #include <memory>
14+#include <cstddef>
1415
1516 namespace qrk
1617 {
--- trunk/libs/gui/Label.cpp (revision 1949)
+++ trunk/libs/gui/Label.cpp (revision 1950)
@@ -9,6 +9,7 @@
99
1010 #include "Label.h"
1111 #include "Surface.h"
12+#include <cstddef>
1213
1314 using namespace qrk;
1415
--- trunk/libs/gui/TextRubiFadeSurface.h (revision 1949)
+++ trunk/libs/gui/TextRubiFadeSurface.h (revision 1950)
@@ -12,6 +12,7 @@
1212
1313 #include "Surface.h"
1414 #include <memory>
15+#include <cstddef>
1516
1617
1718 namespace qrk
--- trunk/libs/gui/LayerManager.cpp (revision 1949)
+++ trunk/libs/gui/LayerManager.cpp (revision 1950)
@@ -58,7 +58,7 @@
5858
5959 void updateEvent(void)
6060 {
61- bool cursor_moved = false;
61+ //bool cursor_moved = false;
6262 SDL_Event event;
6363 while (SDL_PollEvent(&event)) {
6464 switch (event.type) {
@@ -82,7 +82,7 @@
8282 break;
8383
8484 case SDL_MOUSEMOTION:
85- cursor_moved = true;
85+ //cursor_moved = true;
8686 current_cursor_ = Point<long>(event.motion.x, event.motion.y);
8787 event_manager_.checkEnterCursor(current_cursor_,
8888 previous_cursor_);
--- trunk/libs/gui/SwitchSurface.h (revision 1949)
+++ trunk/libs/gui/SwitchSurface.h (revision 1950)
@@ -12,6 +12,7 @@
1212
1313 #include "Surface.h"
1414 #include <memory>
15+#include <cstddef>
1516
1617
1718 namespace qrk
--- trunk/libs/gui/samples/canvasDraw.cpp (revision 1949)
+++ trunk/libs/gui/samples/canvasDraw.cpp (revision 1950)
@@ -27,7 +27,7 @@
2727 CanvasSurface canvas(Rect<long>(0, 0, 100, 100));
2828
2929 screen.clear();
30- Rect<long> dest_rect = canvas.rect();
30+ //Rect<long> dest_rect = canvas.rect();
3131
3232 canvas.setClearColor(Color(0.5, 0.5, 0.5));
3333 canvas.setColor(Color(0.0, 0.0, 1.0));
--- trunk/libs/gui/ChatMessage.h (revision 1949)
+++ trunk/libs/gui/ChatMessage.h (revision 1950)
@@ -14,6 +14,7 @@
1414
1515 #include "Component.h"
1616 #include <memory>
17+#include <cstddef>
1718
1819
1920 namespace qrk
--- trunk/libs/range_sensor/c/urg_ctrl.c (revision 1949)
+++ trunk/libs/range_sensor/c/urg_ctrl.c (revision 1950)
@@ -211,12 +211,10 @@
211211 /* Send PP command. Analyse and store the response */
212212 int urg_parameters(urg_t *urg, urg_parameter_t* parameters)
213213 {
214- int ret = 0;
215-
216214 if (urg_isConnected(urg)) {
217215 *parameters = urg->parameters_;
218216 } else {
219- ret = scip_pp(&urg->serial_, &urg->parameters_);
217+ scip_pp(&urg->serial_, &urg->parameters_);
220218 if (parameters) {
221219 *parameters = urg->parameters_;
222220 }
@@ -513,10 +511,10 @@
513511
514512 char current_type[] = "xx";
515513 int current_first = -1;
516- int current_last = -1;
517- int current_skip_lines = -1;
518- int current_skip_frames = -1;
519- int current_capture_times = -1;
514+ //int current_last = -1;
515+ //int current_skip_lines = -1;
516+ //int current_skip_frames = -1;
517+ //int current_capture_times = -1;
520518 int current_data_bytes = 3;
521519 int dummy_last;
522520 int timeout = ScipTimeout;
@@ -571,8 +569,8 @@
571569
572570 /* Initialisation of receiving settings */
573571 current_first = atoi_substr(&buffer[2], 4);
574- current_last = atoi_substr(&buffer[6], 4);
575- current_skip_lines = atoi_substr(&buffer[10], 2);
572+ //current_last = atoi_substr(&buffer[6], 4);
573+ //current_skip_lines = atoi_substr(&buffer[10], 2);
576574
577575 if ((current_first - store_first) >= data_max) {
578576 /* no data */
@@ -591,8 +589,8 @@
591589 urg->remain_times_ = 0;
592590
593591 } else {
594- current_skip_frames = atoi_substr(&buffer[12], 1);
595- current_capture_times = atoi_substr(&buffer[13], 2);
592+ //current_skip_frames = atoi_substr(&buffer[12], 1);
593+ //current_capture_times = atoi_substr(&buffer[13], 2);
596594
597595 /* In case of MD/MS, store the remaining number of scans. */
598596 urg->remain_times_ = atoi(&buffer[13]);
--- trunk/libs/range_sensor/c/samples/md_scan.c (revision 1949)
+++ trunk/libs/range_sensor/c/samples/md_scan.c (revision 1950)
@@ -47,7 +47,7 @@
4747 int timestamp = -1;
4848 int previous_timestamp;
4949 int remain_times;
50- int scan_msec;
50+ //int scan_msec;
5151 urg_parameter_t parameter;
5252 int ret;
5353 int n;
@@ -71,7 +71,7 @@
7171 exit(1);
7272 }
7373 urg_parameters(&urg, &parameter);
74- scan_msec = urg_scanMsec(&urg);
74+ //scan_msec = urg_scanMsec(&urg);
7575
7676 /* Request for MD data */
7777 /* To get data continuously for more than 100 times, set capture times equal
--- trunk/libs/range_sensor/c/samples/intensity_sample.c (revision 1949)
+++ trunk/libs/range_sensor/c/samples/intensity_sample.c (revision 1950)
@@ -66,7 +66,7 @@
6666 int data_max;
6767 long* data;
6868 long* intensity;
69- int scan_msec;
69+ //int scan_msec;
7070 urg_parameter_t parameter;
7171 int ret;
7272 int n;
@@ -94,7 +94,7 @@
9494 }
9595
9696 urg_parameters(&urg, &parameter);
97- scan_msec = urg_scanMsec(&urg);
97+ //scan_msec = urg_scanMsec(&urg);
9898
9999 if (strcmp("UTM-30LX", urg_model(&urg))) {
100100 /* Top-URG is excluded */
--- trunk/libs/range_sensor/c/samples/evaluate_timestamp.c (revision 1949)
+++ trunk/libs/range_sensor/c/samples/evaluate_timestamp.c (revision 1950)
@@ -43,7 +43,7 @@
4343 long* data;
4444 int timestamp;
4545 int pre_timestamp;
46- int scan_msec;
46+ //int scan_msec;
4747 urg_parameter_t parameter;
4848 int ret;
4949 int n;
@@ -64,7 +64,7 @@
6464 exit(1);
6565 }
6666 urg_parameters(&urg, &parameter);
67- scan_msec = urg_scanMsec(&urg);
67+ //scan_msec = urg_scanMsec(&urg);
6868
6969 assert(CaptureTimes < 100);
7070 urg_setCaptureTimes(&urg, CaptureTimes);
--- trunk/libs/range_sensor/c/samples/infinity_scan.c (revision 1949)
+++ trunk/libs/range_sensor/c/samples/infinity_scan.c (revision 1950)
@@ -29,7 +29,7 @@
2929 int data_max;
3030 long* data;
3131 urg_parameter_t parameter;
32- int scan_msec;
32+ //int scan_msec;
3333
3434 #ifdef WINDOWS_OS
3535 const char device[] = "COM4"; /* For Windows */
@@ -54,7 +54,7 @@
5454 exit(1);
5555 }
5656 urg_parameters(&urg, &parameter);
57- scan_msec = urg_scanMsec(&urg);
57+ //scan_msec = urg_scanMsec(&urg);
5858
5959 /* Request data */
6060 while (1) {
--- trunk/libs/gps/matmat.cpp (revision 1949)
+++ trunk/libs/gps/matmat.cpp (revision 1950)
@@ -132,7 +132,8 @@
132132 int i;
133133 double x1, fx0, dfdx0, aeps;
134134 double soln;
135- int iterations, err;
135+ //int iterations;
136+ int err;
136137
137138 int imax=20;
138139 double eps=1e-13;
@@ -150,7 +151,7 @@
150151 }
151152 x0=x1;
152153 }
153- iterations = i + 1;
154+ //iterations = i + 1;
154155 soln = x1;
155156 if (err) {
156157 printf("Error: not convergence in newton()\n");
--- trunk/Makefile (revision 1949)
+++ trunk/Makefile (revision 1950)
@@ -17,7 +17,7 @@
1717 -cd widgets/ && $(MAKE) clean
1818 -cd programs/ && $(MAKE) clean
1919 -cd doxes/ && $(MAKE) clean
20- -cd tsukuba_2010/ && $(MAKE) clean
20+# -cd tsukuba_2010/ && $(MAKE) clean
2121
2222 libs :
2323 cd libs/ && $(MAKE)
旧リポジトリブラウザで表示