Merge "Replace extract() with explicit variable definitions in DjVuImage"