• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqtwindows誰得cocoapythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

iSightを使ってBooklog,MediaMarkerインポート用CSVファイルを生成するアプリ


Commit MetaInfo

Revision4cd62917af14f84bb573bae16d201e020aeec826 (tree)
Time2011-11-17 21:12:51
Authormasakih <masakih@user...>
Commitermasakih

Log Message

Support x86_64

x86_64に対応。

Change Summary

Incremental Difference

--- a/Japanese.lproj/GeneralPreference.xib
+++ b/Japanese.lproj/GeneralPreference.xib
@@ -77,7 +77,7 @@
7777 <object class="NSTextField" id="243647223">
7878 <reference key="NSNextResponder" ref="151985773"/>
7979 <int key="NSvFlags">268</int>
80- <string key="NSFrame">{{17, 128}, {132, 17}}</string>
80+ <string key="NSFrame">{{15, 128}, {134, 17}}</string>
8181 <reference key="NSSuperview" ref="151985773"/>
8282 <reference key="NSWindow"/>
8383 <reference key="NSNextKeyView" ref="187438968"/>
@@ -246,7 +246,7 @@
246246 <object class="NSTextField" id="977832199">
247247 <reference key="NSNextResponder" ref="692902308"/>
248248 <int key="NSvFlags">268</int>
249- <string key="NSFrame">{{15, 16}, {54, 17}}</string>
249+ <string key="NSFrame">{{13, 16}, {83, 17}}</string>
250250 <reference key="NSSuperview" ref="692902308"/>
251251 <reference key="NSWindow"/>
252252 <reference key="NSNextKeyView" ref="590273973"/>
@@ -264,7 +264,7 @@
264264 <object class="NSTextField" id="590273973">
265265 <reference key="NSNextResponder" ref="692902308"/>
266266 <int key="NSvFlags">268</int>
267- <string key="NSFrame">{{74, 14}, {148, 22}}</string>
267+ <string key="NSFrame">{{101, 14}, {149, 22}}</string>
268268 <reference key="NSSuperview" ref="692902308"/>
269269 <reference key="NSWindow"/>
270270 <bool key="NSEnabled">YES</bool>
@@ -295,7 +295,7 @@
295295 <object class="NSButton" id="524046644">
296296 <reference key="NSNextResponder" ref="692902308"/>
297297 <int key="NSvFlags">268</int>
298- <string key="NSFrame">{{16, 74}, {238, 18}}</string>
298+ <string key="NSFrame">{{14, 74}, {238, 18}}</string>
299299 <reference key="NSSuperview" ref="692902308"/>
300300 <reference key="NSWindow"/>
301301 <reference key="NSNextKeyView" ref="484188188"/>
@@ -319,7 +319,7 @@
319319 <object class="NSPopUpButton" id="267248710">
320320 <reference key="NSNextResponder" ref="692902308"/>
321321 <int key="NSvFlags">268</int>
322- <string key="NSFrame">{{71, 44}, {154, 26}}</string>
322+ <string key="NSFrame">{{98, 44}, {155, 26}}</string>
323323 <reference key="NSSuperview" ref="692902308"/>
324324 <reference key="NSWindow"/>
325325 <reference key="NSNextKeyView" ref="977832199"/>
@@ -387,7 +387,7 @@
387387 <object class="NSTextField" id="484188188">
388388 <reference key="NSNextResponder" ref="692902308"/>
389389 <int key="NSvFlags">268</int>
390- <string key="NSFrame">{{15, 49}, {54, 17}}</string>
390+ <string key="NSFrame">{{13, 49}, {83, 17}}</string>
391391 <reference key="NSSuperview" ref="692902308"/>
392392 <reference key="NSWindow"/>
393393 <reference key="NSNextKeyView" ref="267248710"/>
@@ -403,13 +403,13 @@
403403 </object>
404404 </object>
405405 </object>
406- <string key="NSFrame">{{1, 1}, {265, 102}}</string>
406+ <string key="NSFrame">{{1, 1}, {268, 102}}</string>
407407 <reference key="NSSuperview" ref="183974536"/>
408408 <reference key="NSWindow"/>
409409 <reference key="NSNextKeyView" ref="524046644"/>
410410 </object>
411411 </object>
412- <string key="NSFrame">{{151, 16}, {267, 104}}</string>
412+ <string key="NSFrame">{{151, 16}, {270, 104}}</string>
413413 <reference key="NSSuperview" ref="151985773"/>
414414 <reference key="NSWindow"/>
415415 <reference key="NSNextKeyView" ref="692902308"/>
@@ -436,7 +436,7 @@
436436 <bool key="NSTransparent">NO</bool>
437437 </object>
438438 </object>
439- <string key="NSFrameSize">{435, 194}</string>
439+ <string key="NSFrameSize">{438, 194}</string>
440440 <reference key="NSSuperview"/>
441441 <reference key="NSWindow"/>
442442 <reference key="NSNextKeyView" ref="581720031"/>
--- a/MyBarcodeScanner.h
+++ b/MyBarcodeScanner.h
@@ -93,7 +93,10 @@
9393 //#import "FrameReader.h"
9494 //#import "SeqGrab.h"
9595
96-@class SeqGrab, QTCaptureSession, QTCaptureDevice, AllScanners;
96+#ifndef __LP64__
97+@class SeqGrab;
98+#endif
99+@class QTCaptureSession, QTCaptureDevice, AllScanners;
97100
98101 @interface MyBarcodeScanner : NSObject <NSWindowDelegate> {
99102 @private
@@ -121,7 +124,9 @@
121124
122125 QTCaptureSession *mCaptureSession;
123126
127+#ifndef __LP64__
124128 SeqGrab *mGrabber;
129+#endif
125130
126131 NSDate *lastDateScan;
127132