Merge "Get screencap working correctly in landscape mode" into pi-dev

        sourceCrop.set(dispScissor);

        // adb shell screencap will default reqWidth and reqHeight to zeros.

        if (reqWidth == 0 || reqHeight == 0) {

            reqWidth = uint32_t(dispScissor.width());

            reqHeight = uint32_t(dispScissor.height());

            reqWidth = uint32_t(device->getViewport().width());

            reqHeight = uint32_t(device->getViewport().height());

        }

    }