Attachment 188114 Details for Bug 223746 – "diff -Npudr" patch for port

[patch] "diff -Npudr" patch for port

opensurge.patch (text/plain), 2.94 KB, created by timon on 2017-11-19 12:50:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: timon

Created: 2017-11-19 12:50:03 UTC

Size: 2.94 KB

patch

obsolete

>--- files/patch-src_core_image.c	1970-01-01 03:00:00.000000000 +0300
>+++ files/patch-src_core_image.c	2017-11-19 15:38:57.756149000 +0300
>@@ -0,0 +1,41 @@
>+--- src/core/image.c.orig	2017-11-14 12:17:25 UTC
>++++ src/core/image.c
>+@@ -34,12 +34,6 @@
>+ #include "resourcemanager.h"
>+ #include "util.h"
>+ 
>+-/* image structure */
>+-struct image_t {
>+-    BITMAP *data; /* this must be the first field */
>+-    int w, h;
>+-};
>+-
>+ /* useful stuff */
>+ #define IS_PNG(path) (str_icmp((path)+strlen(path)-4, ".png") == 0)
>+ typedef int (*fast_getpixel_funptr)(BITMAP*,int,int);
>+@@ -233,25 +227,6 @@ image_t *image_create_shared(const image
>+     return img;
>+ }
>+ 
>+-/*
>+- * image_width()
>+- * The width of the image
>+- */
>+-inline int image_width(const image_t *img)
>+-{
>+-    return img->w;
>+-}
>+-
>+-
>+-/*
>+- * image_height()
>+- * The height of the image
>+- */
>+-inline int image_height(const image_t *img)
>+-{
>+-    return img->h;
>+-}
>+-
>+ 
>+ /*
>+  * image_getpixel()
>--- files/patch-src_core_image.h	1970-01-01 03:00:00.000000000 +0300
>+++ files/patch-src_core_image.h	2017-11-19 15:38:57.431939000 +0300
>@@ -0,0 +1,51 @@
>+--- src/core/image.h.orig	2017-11-14 12:16:37 UTC
>++++ src/core/image.h
>+@@ -22,10 +22,15 @@
>+ #ifndef _IMAGE_H
>+ #define _IMAGE_H
>+ 
>++#include "allegro.h"
>+ #include "global.h"
>+ #include "v2d.h"
>+ 
>+-/* opaque image type */
>++/* image structure */
>++struct image_t {
>++    BITMAP *data; /* this must be the first field */
>++    int w, h;
>++};
>+ typedef struct image_t image_t;
>+ 
>+ /* image flags (bitwise OR) */
>+@@ -42,13 +47,29 @@ void image_save(const image_t *img, cons
>+ image_t *image_create_shared(const image_t *parent, int x, int y, int width, int height); /* creates a sub-image */
>+ 
>+ /* properties */
>+-inline int image_width(const image_t *img);
>+-inline int image_height(const image_t *img);
>+ uint32 image_rgb(uint8 r, uint8 g, uint8 b);
>+ void image_color2rgb(uint32 color, uint8 *r, uint8 *g, uint8 *b);
>+ int image_pixelperfect_collision(const image_t *img1, const image_t *img2, int x1, int y1, int x2, int y2);
>+ uint32 image_getpixel(const image_t *img, int x, int y);
>+ 
>++/*
>++ * image_width()
>++ * The width of the image
>++ */
>++inline int image_width(const image_t *img)
>++{ 
>++    return img->w;
>++}
>++
>++/*
>++ * image_height()
>++ * The height of the image
>++ */
>++inline int image_height(const image_t *img)
>++{
>++    return img->h;
>++}
>++
>+ /* drawing primitives */
>+ void image_clear(image_t *img, uint32 color);
>+ void image_putpixel(image_t *img, int x, int y, uint32 color);
>--- Makefile	2017-11-16 00:39:00.000000000 +0300
>+++ Makefile	2017-11-19 15:38:07.449147000 +0300
>@@ -18,10 +18,6 @@ LICENSE_COMB=	multi
> LICENSE_FILE_GPLv2+ =	${WRKSRC}/licenses/GPLv2.txt
> LICENSE_FILE_CC-BY-SA-3.0=	${WRKSRC}/licenses/CC-BY-SA-3.0.txt
> 
>-BROKEN=		Does not build
>-DEPRECATED=	Does not build
>-EXPIRATION_DATE=2018-02-01
>-
> BUILD_DEPENDS=	${LOCALBASE}/lib/libaldmb.a:audio/dumb-allegro \
> 		${LOCALBASE}/include/alfont.h:x11-fonts/alfont \
> 		alureplay:audio/alure

Actions: View | Diff

Attachments on bug 223746: 188114