Subversion Repositories Kolibri OS

Rev

Rev 8452 | Rev 8505 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 8452 Rev 8461
Line 129... Line 129...
129 
	if (key_mode_enter_page_number==1) HandleNewPageNumber(0); else DrawPagination();
 129 
	if (key_mode_enter_page_number==1) HandleNewPageNumber(0); else DrawPagination();
Line 130... Line 130...
130 
 
 130 
 
Line 131... Line 131...
131 
	if (Form.client_width > gapp.image->w) window_center = (Form.client_width - gapp.image->w) / 2; else window_center = 0;
 131 
	if (Form.client_width > gapp.image->w) window_center = (Form.client_width - gapp.image->w) / 2; else window_center = 0;
132 
 
 - 
 
133 
	gapp.panx = 0;
 - 
 
134 
	if (gapp.image->n == 4) {
 - 
 
135 
		 	kos_blit(window_center + Form.client_left,
- 
 
136 
		 		Form.client_top + TOOLBAR_HEIGHT,
- 
 
137 
		 		Form.client_width,
- 
 
138 
		 		Form.client_height - TOOLBAR_HEIGHT,
- 
 
139 
		 		gapp.panx,
- 
 
140 
		 		gapp.pany,
- 
 
141 
		 		gapp.image->w,
- 
 
142 
		 		gapp.image->h,
- 
 
143 
		 		gapp.image->w * gapp.image->n,
- 
 
144 
		 		gapp.image->samples
 - 
 
145 
		 	);
 - 
 
146 
	}
 132 
 
147 
	else if (gapp.image->n == 2)
 - 
 
148 
	{
 - 
 
149 
		int i = gapp.image->w*gapp.image->h;
 - 
 
150 
		unsigned char *color = malloc(i*4);
 - 
 
151 
		if (color != NULL)
 - 
 
152 
		{
 - 
 
153 
			unsigned char *s = gapp.image->samples;
 - 
 
154 
			unsigned char *d = color;
 - 
 
155 
			for (; i > 0 ; i--)
 - 
 
156 
			{
 - 
 
157 
				d[2] = d[1] = d[0] = *s++;
 - 
 
158 
				d[3] = *s++;
 - 
 
159 
				d += 4;
 133 
	gapp.panx = 0;
160 
			}
 134
161 
			kos_blit(window_center + Form.client_left,
135 
	kos_blit(window_center + Form.client_left,
162 
				Form.client_top + TOOLBAR_HEIGHT,
136 
		Form.client_top + TOOLBAR_HEIGHT,
163 
				Form.client_width,
137 
		Form.client_width,
164 
				Form.client_height - TOOLBAR_HEIGHT,
138 
		Form.client_height - TOOLBAR_HEIGHT,
165 
		 		gapp.panx,
139 
		gapp.panx,
166 
		 		gapp.pany,
140 
		gapp.pany,
167 
				gapp.image->w,
141 
		gapp.image->w,
168 
				gapp.image->h,
142 
		gapp.image->h,
169 
				gapp.image->w * 4,
143 
		gapp.image->w * gapp.image->n, // stride
170 
				color
 144 
		gapp.image->samples // image
171 
			);
 145 
	);
- 
 
 146
172 
			free(color);
 147 
/*
- 
 
 148 
	void kos_blit(int dstx, int dsty, int w, int h, int srcx, int srcy, int srcw, int srch, int stride, char *d)
173 
		}
 149 
*/
Line 174... Line 150...
174 
	}
 150 
 
175 
}
 151 
}
Line 367... Line 343...
367 
		if (i != 1) strcat(full_argv, " ");
 343 
		if (i != 1) strcat(full_argv, " ");
368 
		strcat(full_argv, argv[i]);
 344 
		strcat(full_argv, argv[i]);
369 
	}
 345 
	}
Line 370... Line 346...
370
346
371 
	if (argc == 1) {
 347 
	if (argc == 1) {
372 
		kol_board_puts("uPDF: no param set, showing OpenDialog");
 348 
		kol_board_puts("uPDF: no param set, showing OpenDialog...\n");
373 
		RunOpenApp(argv[0]);
 349 
		RunOpenApp(argv[0]);
374 
		exit(0);
 350 
		exit(0);
Line 375... Line 351...
375 
	}
 351 
	}
Line 379... Line 355...
379
355
380 
	char buf[128];
 356 
	char buf[128];
381 
	int resolution = 72;
 357 
	int resolution = 72;
382 
	int pageno = 1;
 358 
	int pageno = 1;
383 
	fz_accelerate();
 359 
	fz_accelerate();
384 
	kol_board_puts("PDF init\n");
 360 
	kol_board_puts("PDF init...\n");
385 
	pdfapp_init(&gapp);
 361 
	pdfapp_init(&gapp);
386 
	gapp.scrw = 600;
 362 
	gapp.scrw = 600;
387 
	gapp.scrh = 400;
 363 
	gapp.scrh = 400;
388 
	gapp.resolution = resolution;
 364 
	gapp.resolution = resolution;
389 
	gapp.pageno = pageno;
 365 
	gapp.pageno = pageno;
390 
	kol_board_puts("PDF Open\n");
 366 
	kol_board_puts("PDF Open...\n");
391 
	pdfapp_open(&gapp, full_argv, 0, 0);
 367 
	pdfapp_open(&gapp, full_argv, 0, 0);
392 
	kol_board_puts("PDF Opened\n");
 368 
	kol_board_puts("PDF Opened!\n");
Line 393... Line 369...
393 
	wintitle(&gapp, 0, full_argv);
 369 
	wintitle(&gapp, 0, full_argv);
Line 394... Line 370...
394
370