From 36e34d3b2f6e3e203b5ce426ab4be36e228f61af Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 18 Mar 2014 18:04:38 -0430 Subject: [PATCH 1/3] Source formatting. --- src/ve/ucv/ciens/ccg/nxtar/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ve/ucv/ciens/ccg/nxtar/MainActivity.java b/src/ve/ucv/ciens/ccg/nxtar/MainActivity.java index 932ba51..dfccb39 100644 --- a/src/ve/ucv/ciens/ccg/nxtar/MainActivity.java +++ b/src/ve/ucv/ciens/ccg/nxtar/MainActivity.java @@ -165,7 +165,7 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica Mat temp = new Mat(); Imgproc.cvtColor(outImg, temp, Imgproc.COLOR_BGR2RGB); - + mFrame = Bitmap.createBitmap(temp.cols(), temp.rows(), Bitmap.Config.RGB_565); Utils.matToBitmap(temp, mFrame); mFrame.compress(CompressFormat.JPEG, 100, outputStream); From 72eb8d2731dcac2bb1032d6b2af653d71f8b994d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 31 Mar 2014 11:03:20 -0430 Subject: [PATCH 2/3] Added a readme file. --- README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..84df903 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +NxtAR-android +============= + +Modulo 2 de mi trabajo especial de grado. From 00038f1622cf873ad64c552f7a63c0ca45a0655f Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 4 Apr 2014 10:29:05 -0430 Subject: [PATCH 3/3] Changed version number. --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2ed440f..dbd2781 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -17,8 +17,8 @@ + android:versionCode="140404" + android:versionName="14.04.04" >