Revert changes from 1.9.5 and bump to 1.9.6

dm77 · Aug 2, 2017 · a526e66 · a526e66
1 parent 81aee5a
commit a526e66
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## [1.9.6] - July 28, 2017
+* Revert changes from 1.9.5 as it causes more harm than good (See #336)
+
 ## [1.9.5] - July 28, 2017
 * Fix incorrectly rotated data on Nexus 5x devices. Thanks to @rramprasad for the pull request #315
 

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Installation
 
 Add the following dependency to your build.gradle file.
 
-`compile 'me.dm7.barcodescanner:zxing:1.9.5'`
+`compile 'me.dm7.barcodescanner:zxing:1.9.6'`
 
 Simple Usage
 ------------
@@ -126,7 +126,7 @@ Installation
 
 Add the following dependency to your build.gradle file.
 
-`compile 'me.dm7.barcodescanner:zbar:1.9.5'`
+`compile 'me.dm7.barcodescanner:zbar:1.9.6'`
 
 Simple Usage
 ------------

diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 
 allprojects {
     group = 'me.dm7.barcodescanner'
-    version = '1.9.5'
+    version = '1.9.6'
 
     repositories {
         mavenCentral()
@@ -44,8 +44,8 @@ subprojects {
                 defaultConfig {
                     minSdkVersion versions.min_sdk
                     targetSdkVersion versions.target_sdk
-                    versionCode 195
-                    versionName "1.9.5"
+                    versionCode 196
+                    versionName "1.9.6"
                 }
             }
         }

diff --git a/core/src/main/java/me/dm7/barcodescanner/core/BarcodeScannerView.java b/core/src/main/java/me/dm7/barcodescanner/core/BarcodeScannerView.java
@@ -315,21 +315,7 @@ public byte[] getRotatedData(byte[] data, Camera camera) {
 
             int displayOrientation = mPreview.getDisplayOrientation();
 
-            int rotationCount = 0;
-            switch (displayOrientation) {
-                case 0:
-                    rotationCount = 0;
-                    break;
-                case 90:
-                    rotationCount = 1;
-                    break;
-                case 180:
-                    rotationCount = 2;
-                    break;
-                case 270:
-                    rotationCount = 3;
-                    break;
-            }
+            int rotationCount = 1;
 
             for (int i = 0; i < rotationCount; i++) {
                 byte[] rotatedData = new byte[data.length];

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -5,7 +5,7 @@ ext.versions = [
         build_tools   : "25.0.2",
         support_lib   : "25.3.1",
         zxing         : "3.3.0",
-        barcodescanner: "1.9.5"
+        barcodescanner: "1.9.6"
 ]
 
 ext.libraries = [