am c0c6f058: Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbad

        mImageBounds.set(0, 0, bitmap.getWidth(), bitmap.getHeight());

        // If display matrix doesn't exist, create it and its dependencies

        if (mDisplayCropMatrix == null || mDisplayMatrix == null || mDisplayMatrixInverse == null) {

            mCropObj.unsetAspectRatio();

            mDisplayMatrix = GeometryMathUtils.getFullGeometryToScreenMatrix(mGeometry,

                    bitmap.getWidth(), bitmap.getHeight(), canvas.getWidth(), canvas.getHeight());

            float straighten = mGeometry.straighten;