Applying bitmap max preview patch fails (8.0.3) #150
Comments
|
Here's the output when the patch fails. (I have the same issue.) ownCloud 8.0.3 |
|
Thanks for the report. I did fix it for myself, but forgot to push the change. |
|
|
I've just checked and didn't understand why I could apply it just fine and then realised it is already fixed in master, so just download it from there. I'm waiting on 2 PRs before releasing 8.0.12 for 8.0.3+ |
|
This? https://raw.githubusercontent.com/owncloud/galleryplus/master/patches/bitmap-max-preview.pull.13635.patch It is the same as what I got from 169116-galleryplus-8.0.11.zip. It doesn't work. Is there a newer patch we are not seeing? |
|
Ah, you're right, silly me. I updated the raw patch... |
|
I can't reproduce... I've downloaded the zip from master |
|
Weird. The file from that master.zip matches the patch file I have. Perhaps our bitmap.php files are different. This is what I got from ownCloud 8.0.3. |
|
Would some checksums be helpful? Do these match what you get with md5sum? |
|
I have exactly the same md5... |
|
On what environment are you? It must be a line-ending issue. You could try running dos2unix to see if it improves the situation And also check that lines don't break in the patch |
|
I am on Linux (Gentoo). More importantly though, I am using GNU patch 2.7.5. Different end of line characters should result in different MD5 checksums. |
|
I'm on FreeBSD. I know some of the options are different. |
|
So for Redmine 3.0.1 I can just download the latest and test this out? Just want to be sure before I explode stuff ;) I'm on Ubuntu 14 btw |
|
For oC 8.0.3 you mean? You can download master, yes. |
|
Haa haa whoops someone needed more coffee.. cool I'll give it a try for oCloud |
|
Cool! Master worked perfectly for me thanks heaps.. AND I really like the new sort types (a-z and date) nice work! |
|
I figured this out. The last line in the patch file does not contain a newline character. This causes the patch to fail with GNU patch and evidently does not cause it to fail with the version of patch included with FreeBSD. Fixing the end of line character at the end of the file would make this patch more compatible with other systems. So, this was an end-of-line issue, but there were no windows carriage return characters involved. |
|
You're right, it's missing and I'll add it. It's a mistake, ownClouders are pretty strict about these sort of things and that confirms why it's important... |
Hey there
This is such a great addition to owncloud!!
On OwnCloud 8.0.3 (stable) I applied the suggested patches as follows:
The first one went through properly but the second seems to have failed tragically... is there a new release of this patch (I tried to find a corresponding ticket for this just to download it myself but no dice)
:::::::::::::: lib/private/preview/bitmap.php.rej :::::::::::::: --- lib/private/preview/bitmap.php.orig 2015-03-06 15:14:17.770952395 +0000 +++ lib/private/preview/bitmap.php 2015-03-06 15:02:38.803951481 +0000 @@ -9,31 +10,93 @@ namespace OC\Preview; +use Imagick; + +/** + * Creates a PNG preview using ImageMagick via the PECL extension + * + * @package OC\Preview + */ abstract class Bitmap extends Provider { + + /** + * @type array + */ + private $maxDims; + /** * {@inheritDoc} */ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { + $this->maxDims = [$maxX, $maxY]; + $tmpPath = $fileview->toTmpFile($path); + if (!$tmpPath) { + return false; + } - //create imagick object from bitmap or vector file + // Creates \Imagick object from bitmap or vector file try { - // Layer 0 contains either the bitmap or - // a flat representation of all vector layers - $bp = new \Imagick($tmpPath . '[0]'); - - $bp->setImageFormat('png'); + $bp = $this->getResizedPreview($tmpPath); } catch (\Exception $e) { - \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR); + \OC_Log::write('core', 'ImageMagick says : ' . $e->getmessage() , \OC_Log::ERROR); return false; } unlink($tmpPath); //new bitmap image object - $image = new \OC_Image($bp); + $image = new \OC_Image(); + $image->loadFromData($bp); //check if image object is valid return $image->valid() ? $image : false; } -} + /** + * Returns a preview of maxX times maxY dimensions in PNG format + * + * * The default resolution is already 72dpi, no need to change it for a b itmap output + * * It's possible to have proper colour conversion using profileimage(). + * ICC profiles are here: http://www.color.org/srgbprofiles.xalter + * * It's possible to Gamma-correct an image via gammaImage() + * + * @param string $tmpPath the location of the file to convert + * + * @return \Imagick + */ + private function getResizedPreview($tmpPath) { + $bp = new Imagick(); + + // Layer 0 contains either the bitmap or a flat representation of all v ector layers + $bp->readImage($tmpPath . '[0]'); + + $bp = $this->resize($bp); + + $bp->setImageFormat('png'); + + return $bp; + } + + /** + * Returns a resized \Imagick object + * + * If you want to know more on the various methods available to resize an + * image, check out this link : @link https://stackoverflow.com/questions/85173 04/what-the-difference-of-sample-resample-scale-resize-adaptive-resize-thumbnail-im + * + * @param \Imagick $bp + * + * @return \Imagick + */ + private function resize($bp) { + list($maxX, $maxY) = $this->maxDims; + list($previewWidth, $previewHeight) = array_values($bp->getImageGeometr y()); + + // We only need to resize a preview which doesn't fit in the maximum di mensions + if ($previewWidth > $maxX || $previewHeight > $maxY) { + // TODO: LANCZOS is the default filter, CATROM could bring simi lar results faster + $bp->resizeImage($maxX, $maxY, imagick::FILTER_LANCZOS, 1, true ); + } + + return $bp; + } +}The text was updated successfully, but these errors were encountered: