atsuo****@users*****
atsuo****@users*****
2010年 4月 27日 (火) 17:05:25 JST
ForkThis is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to "nyartoolkit-and" repository
containing the "nyartoolkit-and" project.
The branch, android-1.6 has been updated
via f599328505d500218f967599f7cb15369d561049 (commit)
via 824c0cd0b5b9d37e14e135d9bbf06521c227555a (commit)
via 682eaa0903d223aa559f8e63810aa67be3a70de6 (commit)
via 25c3ba1e338f37b35e8816063dee2c120c137f7c (commit)
via 5c3de4dcb3ed2c311507f58dc512575ae416fe95 (commit)
via a9dfbf0386923895000ad6dd5e7a8c866cb537c3 (commit)
via e41152607ff6a608c66323379592b8c573b4e4e2 (commit)
via eb73090eb71ae8ec0f7942554bb48389959c3e76 (commit)
via 8728b3a768a3407931527fe66c630039ca4a4122 (commit)
via d700db683f03ff5b0c4e46484a03a32771316932 (commit)
via 2ddf62ecf8ddef5b50a9beb0ee4a459707bd7685 (commit)
via 3ae5ed3c0f68e4004ec66a6cd30bba7cc1c98f5d (commit)
via 3be80b6b6145b819663d7be0bac395c1f78a316a (commit)
via 1635fa7d7685aab35429553bc29f921dd365c267 (commit)
via fe750a031e0c46f56a7f97f9c939650444dbe3a4 (commit)
via 8a6d71531b0deed00e8150f9d3d1a74ceb1546b0 (commit)
via 3851dd8ad116a1478202b57cd20971d7a77b6f25 (commit)
via 91b2d5b39f2d1b3a6bc7e1ef9250d3e42d0a3df3 (commit)
via 97dcb66301c4ad0af61b385f3cabbad4d3290012 (commit)
via e777c440f03c51fac9cbcdb48540007800c7d21b (commit)
via d6f32d5dadb844419eb48ae0015330c8341487d0 (commit)
via c50911c305827af57874e2e70d3b2879e0901034 (commit)
via 3e7c774eabbcf7d56acea98b7b534c72954668e6 (commit)
via 00c6986c700f3f91bda9c566563197a1254a32ce (commit)
via 7e4c2cb925918abceb04d80bf6bc9522142c1304 (commit)
via 170d605d7affbec948c758c097022730aad651b6 (commit)
via 0fece2231dbb5e22ecda68d540cc7fd09f210cc4 (commit)
via 684b73231b76b7bcca0eb2d23975d556404551bd (commit)
via 2cc81264b50d75fec7f23c24db6d4f88764871a0 (commit)
via a042b1f0cb7eef73975dd383e4a5492d7efa844e (commit)
via 7eee2270e282165811fe8434f65311fcb5350ef1 (commit)
via 0e713f98a307e947556de2ef61bc48c2f80f0d93 (commit)
via c8b8cf7f78ea756874a15f0473988de1b2d25894 (commit)
via 8de4952b7eddc8693296125fe0719845598fd121 (commit)
via 6d89747967c02eeb7e089cf8125e0de80ad16a40 (commit)
via 3dfd59d6de256f463d89fffc61a7dfbb9775215e (commit)
via c3a4fb36115914ec7817fb1d4f2d0a6fd00857b6 (commit)
via 6b8e60daa915a235f126c91944ba9e6fe76e5d03 (commit)
via a0412494fc8c7a2e22f274d5f897929e9725dabd (commit)
via 7207d4649015ec81a434dd49dc69f9bfcdc10f54 (commit)
via ab2ef6d9bcfed8e9800cfa4a84912b62b21b6224 (commit)
via 685f04020532fa0f039076316b501ae5f0df8be0 (commit)
via a0bc99ad94f674e1857cd6e916480375da8494be (commit)
via a34549b473a7a512cc64a7acabdb0f91c172fe69 (commit)
via 4172a953548c9a3848ae36ace0c68fd0091fcc21 (commit)
via 88a5f8d0cb55424abe4f1a1fac737c28b8f78754 (commit)
via 36f04f864c3319c4b49c29618f6e1d6aae9388c9 (commit)
via d6d5afd06943480c0aa867bb4cfe392f33d1e0e2 (commit)
via 9939955cbb834e4dd6a7ccf36a8c8ab970119190 (commit)
via 930aabfad9810d0657e8f71a79d3181a18b4f740 (commit)
via 9729dfa1ec5d8f43bfa65b0f3616891cb43ab412 (commit)
via f6af986e3e5f44d58aba5bafe8f46c438ed9a266 (commit)
via dcb6552021c557fe584cafaa21c0d753c4008303 (commit)
via e0db982caef850c00d69911040c016ec58c58c81 (commit)
via 269d88ac815f5e6504edf9c01cf9b477230beb52 (commit)
via c91bff2e8324516cfe86bcee9b49b10750e97414 (commit)
via 8951b5ecd405cc667dedd3971776d907ed46055b (commit)
via d1883fcad97ffaf667d14a70252f3f87f5b28101 (commit)
via f73e3b173779c73f2226a51769d2d7e043942b83 (commit)
via c9d2dac14452d7adcc3ef475644a06b6e27d66b2 (commit)
via 48c1ba0d274018fe7d2ddc5400a33927b0f9121f (commit)
via ade3b458bff65c4bb015d36ac0466be4fc96ec6d (commit)
via 4aed021d70ebf2aaf161774bd6d53d3782774e6d (commit)
via 85d90253da7d891cb82800369045c4893896359d (commit)
via 9762039ce27259bf5170d47c180e87cb3a0234f0 (commit)
via e45d33fee0c586d9dd5d1aa5bf4972569c4b5818 (commit)
via 2c948b9167ca3ce77f28a3c23efa5094043c6245 (commit)
via 2b6c073c9e1562815ed1915978631315578e2515 (commit)
via 7043c691248e08ce4ffab7c77bd434ce7efd708f (commit)
via 9d168dad4d02bb0c230071df86cc7ae7023a256b (commit)
via ad59266b9c2be1cd1037e744b0a8ea865740ef0f (commit)
via d353991ae8f159b005b387c9a14f0eb087440659 (commit)
via 84ffc73351aac5e90fd41434cf15557633678fe8 (commit)
via 4492ffebdbc8d9f8fb8c087722e4a03129d618c3 (commit)
via e717b0551b909432fcbf934eca2e94f5db810230 (commit)
via b86391bfef83d272cf6238723d3e3993505d36dd (commit)
via 65c35c68440a94f15420e361dff89ae44f5d240a (commit)
via 7cdd0148660a4eb3977c5246027537d9ddb7b504 (commit)
via 0f4757e0877f9fd1c2a9143e5aa3ca5a2538e66e (commit)
via 85227a2f0b1486f3a7adad37bff90f831527df51 (commit)
via bd27a08970ebc7123b1d4792a980a370ba63c788 (commit)
via 7c3913aeb9d69fd44bc292237178c0f78b1242c8 (commit)
via a954aa05506a6eb609f65197a9ce9030c124d854 (commit)
via 8e01bcd7e59f69b2d8b6343274aaa7e346a48172 (commit)
via 54e8bd679f13a1df6f572711bd4186665c744cf2 (commit)
via 3caa245821825c80af17a885e09b9fab446d9f82 (commit)
via 1d922a263ab19bbbaaae642a02b74c07f71fede3 (commit)
via a20303684bbaac02f1a3c956e598bb6998a40054 (commit)
via aa1d570b230e8525e69a300902732900e4b76d4e (commit)
via 8db96b6aac3340d16d821db7eef0b69c810b672c (commit)
via f19b98c3f89d898bd177197eab21cc9e5caca848 (commit)
via d9130bda85a637d5161c1fda44ac04be73f4c9b6 (commit)
via c4925079433532b91f9164ae8d2e3cadd360cfef (commit)
via 7640e66b1c78febbf8eccf72482ba2a3e809a49e (commit)
via 13833c4c932a992b788f35b54cd4c8e1660f936e (commit)
via 0de5db76b0d413ff26122abd8ebeb6ca56d567d3 (commit)
via 4d2ff514b4fe1bfbc89449cfa256c375f9f686d4 (commit)
via 22b4b1bfd6166eed4e0d6e25288d01b040765b65 (commit)
via bf2ce5c080ec3c209f5d51f94231e96ae3bb5058 (commit)
via 7a077bb4e21566e4c1b62e363f11b623eb4ef8c5 (commit)
via f3d8c1dfbb8cce009180fcc03b99d2945408eb5f (commit)
via 7d1fca2d65e27a71ff65c19de08d08f26419c571 (commit)
via 379f12147046fdb4e343599d6dcb255ffb00fa47 (commit)
via cfe3c325a4434a2beeb30a080d5219383d7a9883 (commit)
via 363c76c2157a0d1dab50f23dcfd045b29a16156e (commit)
via 4c0ec05896755a96b1edfa52372aa0a43ed4b3d0 (commit)
via eb39472da11458ff777003a34731097640473ce7 (commit)
via 39f110919f89e44a378d3078b29cc610daf6c2ea (commit)
via 86705ee814bb79bc1510b602d854be503f2e94e8 (commit)
via 8f20220c2e5415ee42e5c912b4bd07e889ef2ba2 (commit)
via c987b9f985ad578d9e49564ea3ee3e498a540d16 (commit)
via 3d486f11bf217289434124f07d369acda3b45572 (commit)
via 12d6ba3b423bba92c7749446143d7ea90a807abd (commit)
via e4df616a1c07d0e1629d03a224122c69fdfe6594 (commit)
via b9e1fe36a6fc784ec7873c690158d003e85bcb2a (commit)
via 42e603f66e940418f415ac08cfcb4046a711e435 (commit)
via 4182cd01fb7b1499e457ab36a8eb76bf8245154c (commit)
via cda952adc84026520844c8d11e2bd0bbb895c11e (commit)
via 4f8adc75a86778154a79ac5977fc34a0513b4f97 (commit)
via 7620c02870e14cee53663b13e2146ab802eaa348 (commit)
via 31e6a32ead16ba6fd3f4792bb669b60f394e0709 (commit)
via 5db1af5bdff29123aa27d94c479d6822e3bd2596 (commit)
via 3e9929e44cddcf2a28d710d379b8bf8c0094ba7d (commit)
via 2758086c47ec70386af0af100715b5828b60dd95 (commit)
via 5ea10170de346ece01908f62fe70783d990f35ac (commit)
via 5b73a3a016709ff3652be0389a185f3f80172b2d (commit)
via 984c7712e2cab8e44ce1d824e09eb5420026990a (commit)
via fe859a2f8942177db28d1d3b8155778c55a470e3 (commit)
via 314168329ed544d5113f218621068516688b7084 (commit)
via 896148b27c2dccf8c8065a66254a9cc987af9000 (commit)
via 27a012c37fecf7f6cc4950e0b1f0697d9d7b0754 (commit)
via 2fc8c131b504acab49304e9cc26e0a9775cb1ec0 (commit)
via 68570b11d57b1d11e42a09b4c0ef3142ab45d520 (commit)
via e4330d6cd8b6df87d5cf12fa0f6955453136231c (commit)
via 678e5469b61962cc81bc36f71bddf03582c4d587 (commit)
via 9f758c0cda6817aaa473d7f27c0ca0082969ff71 (commit)
via 47d0d334de21c1cb3ef7663c187701de7015a98f (commit)
via 6c02e0f916249c000cd529f2077c102453968a30 (commit)
via f0acaf876b9acf949a4ee877ccb9a5f252a7dab9 (commit)
via 0906d680f18a83d7b7cf16da72e71ff6cdbbb46c (commit)
via 3dfaed97950cc9478d2bec482bed22c7ae12a46f (commit)
via 1ebdd89cd9b5c11eb31c0eeeb618169b7df4980e (commit)
via 0be226f3659f8b9025474b9688874099deeab6c4 (commit)
via 189ce4ea35e82acdc5aaf5ed02dd0bc11368e9a6 (commit)
via be769043ee4d7b06d16de37b6467b32ed1d4599e (commit)
via f3311fddc2c31aae4f50b86315fb7b70139ca51b (commit)
via 0416b63dffd0e693cf7f537a026c760b331180ac (commit)
via b3bf20565fa5a56af7568075b2712b4e6b83ad02 (commit)
via 373e6f725a31b11fc087e724aa0c499ea0535eb6 (commit)
via be4a66ebe8e7b1edb206ea0acb630ffa6dc207b4 (commit)
via 8205992b382ad58f38082cdf4ec3f8fe49a2cd69 (commit)
via 890b3238c9463d89160dc0614cc420b3f927c7f6 (commit)
via 6e079f00be3dc81c7fac731bad3d4fe49955d8bb (commit)
via 79d51ab70d8ddb9d5521a250e3d5ef167655d177 (commit)
via 2bd8b0943708f3a9c1762c3eaa43326f345c14b1 (commit)
via 9c9bc909f5fad550b807f456a72ccdb2bfadd740 (commit)
via b8561a9ebd4b26bb1712d49a5ca6ac0c8d67bfbb (commit)
via bc483d7e21a8fc0f9d9405674adb450f22f1f1d1 (commit)
via 8bdd3aeac0f58eebf1ae29b2a35990fc0af7a39f (commit)
via 900a9f3c8b35b776e6c1264ef556c76ec21ec7cb (commit)
via d50f72cd607e84d01b8b1c18506c65c7f04ef88b (commit)
via 8689d9b84bfea574afea9ab175e7b158b61e3098 (commit)
via e6421d68e55c5f3cfb2c285c9c8d13081dcb7c3c (commit)
via 16d81007974f137833458ae6fa66530da85404c9 (commit)
via 1417a20bcefbce75554870089f8b1ec95888b979 (commit)
via 79bda195c17c15f4374a367c43f2456b7a463c1b (commit)
via 0ea7dce5047dde0e60dfb63bcbce761b4a00998e (commit)
via d0f288c9fa1de9c0eca0967c353a6a13560c8bf3 (commit)
via 4600a6903fa8fbceedccad35605a14e5aa53d0c0 (commit)
via 94849e7b6d221ab56c3cfaf8310296c29b1f36eb (commit)
via dd775c89420499f63a89195b189d6cf2595370b8 (commit)
via aaa74abfc2b659039ea15e9228d964dc9c22d1f4 (commit)
via e488c229047fe604fdfd5b237411ed475311ecd3 (commit)
via 7bac7ace4d0ffbc8ef9a7665b68456cc2494208a (commit)
via 050e25504dbd589ec612f1868e0080864299614b (commit)
via e1cdf51e01b73ea85a19a571cab678a62d11f26b (commit)
via 9cf6edd8a0147c78cc75b174c6760ee87bb5801a (commit)
via 8c3dbc73b65980b13d67f953f95457a16f820c7f (commit)
via a4736051acd4ad21310c885eba63f12b4af063db (commit)
via e5235faa65090f696421af71c17cb3e9d05a0d75 (commit)
via 6d7dfb3d981878f5ffd99b4cc3f35d14381c1f0d (commit)
via 27957e4043fb7987beee464a77a8cc87ceef8fef (commit)
via 56695be5b769aafbf283c98b51f5a25b38a4347e (commit)
via 3516ad10960669c09f11b7dcb5fa1be4a47e8cb2 (commit)
via b5c6e5336f9284a6fabaf81eaefc43589b06724e (commit)
via 60058b0a9e4f1dd5fce3e673465c3f352915da1b (commit)
via 350a182c1e86311bd24ebd141ecf52d2e6e246e9 (commit)
via 9d87644f40f58c9b2877e3b04ced6b24a06fd4b8 (commit)
via 4fd43556853554023cfe1c32ef4947afdfa7aafd (commit)
via 434e4cc6cbfdf630ce6a47e93f50460b1fc85251 (commit)
via 77eb424be778d8f3850e19382e756d31db6a7c47 (commit)
via 6bb1a310b3d0346929931e84044bdbf56b6d2202 (commit)
via bc64cbadcf99b914e5f24ee3df9d3fb77ad90da8 (commit)
via db1b93ec65e43dde054d3003a48f669504d8f411 (commit)
via a01e524285ccd1f3db1f062286f21cfd98ecb958 (commit)
via ad1fe136a1f243418224cda594744affc724899c (commit)
via aeff691088a0346b6ed609181d7a71906de7e6e8 (commit)
via 9aead18055a3ef59842603fc3e30750bd0da8ee2 (commit)
via d57ba4f737ad0ec41d289d35815ce406a04b7185 (commit)
from 76cfeb091aa37c9d326e70ec5ddc643e998af6e2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f599328505d500218f967599f7cb15369d561049
Merge: 76cfeb091aa37c9d326e70ec5ddc643e998af6e2 824c0cd0b5b9d37e14e135d9bbf06521c227555a
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date: Tue Apr 27 16:59:12 2010 +0900
Merge branch 'master' into android-1.6
Conflicts:
src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfNyARRaster_RGB.java
src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java
src.utils/qt/jp/nyatla/nyartoolkit/qt/utils/QtNyARRaster_RGB.java
-----------------------------------------------------------------------
Summary of changes:
readme.ja.txt | 123 +++++-----
.../nyartoolkit/jmf/sample/LabelingViewer.java | 2 +-
.../nyartoolkit/jogl/sample/JavaSimpleLite.java | 8 +-
.../nyartoolkit/jogl/sample/JavaSimpleLite2.java | 6 +-
.../nyartoolkit/jogl/sample/SingleARMarker.java | 22 +-
.../nyartoolkit/jogl/sample/SingleNyIdMarker.java | 28 ++--
.../utils/j2se/NyARRGBRaster_BufferedImage.java | 4 +-
.../nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java | 3 +-
.../core/labeling/artoolkit/NyARLabelingImage.java | 2 +-
.../core/pickup/NyARColorPatt_Perspective_O2.java | 6 +-
.../nyartoolkit/core/raster/NyARBinRaster.java | 6 +-
.../core/raster/NyARGrayscaleRaster.java | 6 +-
.../nyartoolkit/core/raster/NyARHsvRaster.java | 2 +-
.../nyatla/nyartoolkit/core/raster/NyARRaster.java | 4 +-
.../core/raster/NyARRaster_BasicClass.java | 4 +-
.../nyartoolkit/core/raster/rgb/NyARRgbRaster.java | 4 +-
.../core/raster/rgb/NyARRgbRaster_BasicClass.java | 5 +-
.../core/raster/rgb/NyARRgbRaster_Blank.java | 2 +-
.../NyARRgbPixelReader_BYTE1D_R8G8B8_24.java | 6 +-
.../core/squaredetect/NyARCoord2Linear.java | 6 +-
.../NyARSquareContourDetector_ARToolKit.java | 3 +-
.../NyARSquareContourDetector_Rle.java | 4 +-
.../core/types/matrix/NyARDoubleMatrix22.java | 4 +-
.../core/utils/NyARPerspectiveParamGenerator.java | 89 +++++---
.../utils/NyARPerspectiveParamGenerator_O1.java | 243 ++++++++++++++++----
.../detector/NyARCustomSingleDetectMarker.java | 11 +-
.../nyartoolkit/detector/NyARDetectMarker.java | 2 +-
.../detector/NyARSingleDetectMarker.java | 6 +-
.../processor/SingleARMarkerProcesser.java | 4 +-
.../processor/SingleNyIdMarkerProcesser.java | 4 +-
.../dev/tracking/MarkerTracking_3dTrans.java | 17 +-
.../jp/nyatla/nyartoolkit/dev/tracking/TrTest.java | 11 +-
32 files changed, 420 insertions(+), 227 deletions(-)
hooks/post-receive
--
nyartoolkit-and (nyartoolkit-and)