jro_apps/redmine Commit - r7686:6cd33a48159e

improve rmagick feature of rfpdf plugin for PDF inline images (#3261)...

Toshi MARUYAMA -

r7686:6cd33a48159e

parent child

Context file:

r7686:6cd33a48159e

Collapse all files

vendor/plugins/rfpdf/lib/core/rmagick.rb +5 0

                 end
                 out['bits'] = image.channel_depth
+                File.open( TCPDF.k_path_cache + File::basename(filename), 'w'){|f|
+                  f.binmode
+                  f.print image.to_blob
+                  f.close
+                }
                 out
               end

vendor/plugins/rfpdf/lib/tcpdf.rb +84 -27

             		if (@images[file].nil?)
             			#First use of image, get info
             			if (type == '')
-            				pos = file.rindex('.');
+            				pos = File::basename(file).rindex('.');
-            				if (pos == 0)
+            				if (pos.nil? or pos == 0)
             					Error('Image file has no extension and no type was specified: ' + file);
             				end
+            				pos = file.rindex('.');
             				type = file[pos+1..-1];
             			end
             			type.downcase!
             			if (type == 'jpg' or type == 'jpeg')
             				info=parsejpg(file);
-            			elsif (type == 'png')
+            			elsif (type == 'png' or type == 'gif')
-            				info=parsepng(file);
+            				img = Magick::ImageList.new(file)
+            				img.format = "PNG"     # convert to PNG from gif
+            				img.opacity = 0        # PNG alpha channel delete
+            				File.open( @@k_path_cache + File::basename(file), 'w'){|f|
+            					f.binmode
+            					f.print img.to_blob
+            					f.close
+            				}
+            				info=parsepng( @@k_path_cache + File::basename(file));
+            				File.delete( @@k_path_cache + File::basename(file))
             			else
             				#Allow for additional formats
             				mtd='parse' + type;
             		end
             		#Automatic width and height calculation if needed
             		if ((w == 0) and (h == 0))
+            			rescale_x = (@w - @r_margin - x) / (info['w'] / (@img_scale * @k))
+            			rescale_x = 1 if rescale_x >= 1
+            			if (y + info['h'] * rescale_x / (@img_scale * @k) > @page_break_trigger and !@in_footer and AcceptPageBreak())
+            				#Automatic page break
+            				if @pages[@page+1].nil?
+            					ws = @ws;
+            					if (ws > 0)
+            						@ws = 0;
+            						out('0 Tw');
+            					end
+            					AddPage(@cur_orientation);
+            					if (ws > 0)
+            						@ws = ws;
+            						out(sprintf('%.3f Tw', ws * @k));
+            					end
+            				else
+            					@page += 1;
+            				end
+            				y=@t_margin;
+            			end
+            			rescale_y = (@page_break_trigger - y) / (info['h'] / (@img_scale * @k))
+            			rescale_y = 1 if rescale_y >= 1
+            			rescale = rescale_y >= rescale_x ? rescale_x : rescale_y
             			#Put image at 72 dpi
             			# 2004-06-14 :: Nicola Asuni, scale factor where added
-            			w = info['w'] / (@img_scale * @k);
+            			w = info['w'] * rescale / (@img_scale * @k);
-            			h = info['h'] / (@img_scale * @k);
+            			h = info['h'] * rescale / (@img_scale * @k);
-            		end
+            		elsif (w == 0)
-            		if (w == 0)
             			w = h * info['w'] / info['h'];
-            		end
+            		elsif (h == 0)
-            		if (h == 0)
             			h = w * info['h'] / info['w'];
             		end
             		out(sprintf('q %.2f 0 0 %.2f %.2f %.2f cm /I%d Do Q', w*@k, h*@k, x*@k, (@h-(y+h))*@k, info['i']));
             		if (a.empty?)
             			Error('Missing or incorrect image file: ' + file);
             		end
-            		if (a[2]!='JPEG')
+            		if (!a[2].nil? and a[2]!='JPEG')
             			Error('Not a JPEG file: ' + file);
             		end
             		if (a['channels'].nil? or a['channels']==3)
             		bpc=!a['bits'].nil? ? a['bits'] : 8;
             		#Read whole file
             		data='';
-            	  open(file,'rb') do |f|
+            		open( @@k_path_cache + File::basename(file),'rb') do |f|
             			data<<f.read();
             		end
+            		File.delete( @@k_path_cache + File::basename(file))
             		return {'w' => a[0],'h' => a[1],'cs' => colspace,'bpc' => bpc,'f'=>'DCTDecode','data' => data}
             	end
             		end
             		w=freadint(f);
             		h=freadint(f);
-            		bpc=f.read(1)[0];
+            		bpc=f.read(1).unpack('C')[0];
             		if (bpc>8)
             			Error('16-bit depth not supported: ' + file);
             		end
-            		ct=f.read(1)[0];
+            		ct=f.read(1).unpack('C')[0];
             		if (ct==0)
             			colspace='DeviceGray';
             		elsif (ct==2)
             		else
             			Error('Alpha channel not supported: ' + file);
             		end
-            		if (f.read(1)[0] != 0)
+            		if (f.read(1).unpack('C')[0] != 0)
             			Error('Unknown compression method: ' + file);
             		end
-            		if (f.read(1)[0]!=0)
+            		if (f.read(1).unpack('C')[0] != 0)
             			Error('Unknown filter method: ' + file);
             		end
-            		if (f.read(1)[0]!=0)
+            		if (f.read(1).unpack('C')[0] != 0)
             			Error('Interlacing not supported: ' + file);
             		end
             		f.read(4);
             				#Read transparency info
             				t=f.read( n);
             				if (ct==0)
-            					trns = t[1][0]
+            					trns = t[1].unpack('C')[0]
             				elsif (ct==2)
-            					trns = t[[1][0], t[3][0], t[5][0]]
+            					trns = t[[1].unpack('C')[0], t[3].unpack('C')[0], t[5].unpack('C')[0]]
             				else
             					pos=t.include?(0.chr);
             					if (pos!=false)
             	end
             	#
+            	# Convert to accessible file path
+            	# @param string :attrname image file name
+            	#
+            	def getImageFilename( attrname )
+            		nil
+            	end
+            	#
             	# Process opening tags.
             	# @param string :tag tag name (in upcase)
             	# @param string :attr tag attribute (in upcase)
             			when 'img'
             				if (!attrs['src'].nil?)
-            				Write(@lasth, '!' + attrs['src'] + '!', '', fill);
+            					# Only generates image include a pdf if RMagick is avalaible
-            =begin Comment out. Because not implement image output yet.
+            					unless Object.const_defined?(:Magick)
-            					# replace relative path with real server path
+            						Write(@lasth, attrs['src'], '', fill);
-            					attrs['src'] = attrs['src'].gsub(@@k_path_url_cache, @@k_path_cache);
+            						return
+            					end
+            					file = getImageFilename(attrs['src'])
+            					if (file.nil?)
+            						Write(@lasth, attrs['src'], '', fill);
+            						return
+            					end
             					if (attrs['width'].nil?)
             						attrs['width'] = 0;
             					end
             						attrs['height'] = 0;
             					end
-            					Image(attrs['src'], GetX(),GetY(), pixelsToMillimeters(attrs['width']), pixelsToMillimeters(attrs['height']));
+            					begin
-            					#SetX(@img_rb_x);
+            						Image(file, GetX(),GetY(), pixelsToMillimeters(attrs['width']), pixelsToMillimeters(attrs['height']));
-            					SetY(@img_rb_y);
+            						#SetX(@img_rb_x);
-            =end
+            						SetY(@img_rb_y);
+            					rescue => err
+            						logger.error "pdf: Image: error: #{err.message}"
+            						Write(@lasth, attrs['src'], '', fill);
+            						if File.file?( @@k_path_cache + File::basename(file))
+            							File.delete( @@k_path_cache + File::basename(file))
+            						end
+            					end
             				end
             			when 'ul', 'ol'

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages