infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-30 12:50:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

8202476: ImageLib is broken in 32 bit Windows

Browse Source 
Reviewed-by: prr, ihse, mbaesken
This commit is contained in:
Alexey Ivanov 2018-05-04 19:23:21 +01:00
parent 69c55eb2de
commit 30f9ec8623
6 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -227,7 +227,8 @@ mlib_image* mlib_ImageSet(mlib_image *image,
}
/***************************************************************/
JNIEXPORT mlib_image* JNICALL mlib_ImageCreateStruct(mlib_type type,
JNIEXPORT
mlib_image* mlib_ImageCreateStruct(mlib_type type,
mlib_s32 channels,
mlib_s32 width,
mlib_s32 height,
@ -253,7 +254,8 @@ JNIEXPORT mlib_image* JNICALL mlib_ImageCreateStruct(mlib_type type,
}
/***************************************************************/
JNIEXPORT mlib_image* JNICALL mlib_ImageCreate(mlib_type type,
JNIEXPORT
mlib_image* mlib_ImageCreate(mlib_type type,
mlib_s32 channels,
mlib_s32 width,
mlib_s32 height)
@ -352,7 +354,8 @@ JNIEXPORT mlib_image* JNICALL mlib_ImageCreate(mlib_type type,
}
/***************************************************************/
JNIEXPORT void JNICALL mlib_ImageDelete(mlib_image *img)
JNIEXPORT
void mlib_ImageDelete(mlib_image *img)
{
if (img == NULL) return;
if ((img -> flags & MLIB_IMAGE_USERALLOCATED) == 0) {

5
src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -299,7 +299,8 @@ mlib_status mlib_ImageAffine_alltypes(mlib_image *dst,
}
/***************************************************************/
JNIEXPORT mlib_status JNICALL mlib_ImageAffine(mlib_image *dst,
JNIEXPORT
mlib_status mlib_ImageAffine(mlib_image *dst,
const mlib_image *src,
const mlib_d64 *mtx,
mlib_filter filter,

5
src/java.desktop/share/native/libmlib_image/mlib_ImageConvKernelConvert.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -78,7 +78,8 @@
#endif /* __sparc */
/***************************************************************/
JNIEXPORT mlib_status JNICALL mlib_ImageConvKernelConvert(mlib_s32 *ikernel,
JNIEXPORT
mlib_status mlib_ImageConvKernelConvert(mlib_s32 *ikernel,
mlib_s32 *iscale,
const mlib_d64 *fkernel,
mlib_s32 m,

5
src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -90,7 +90,8 @@
#include "mlib_ImageConvEdge.h"
/***************************************************************/
JNIEXPORT mlib_status JNICALL mlib_ImageConvMxN(mlib_image *dst,
JNIEXPORT
mlib_status mlib_ImageConvMxN(mlib_image *dst,
const mlib_image *src,
const mlib_s32 *kernel,
mlib_s32 m,

5
src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -78,7 +78,8 @@
#include "mlib_c_ImageLookUp.h"
/***************************************************************/
JNIEXPORT mlib_status JNICALL mlib_ImageLookUp(mlib_image *dst,
JNIEXPORT
mlib_status mlib_ImageLookUp(mlib_image *dst,
const mlib_image *src,
const void **table)
{

14
src/java.desktop/share/native/libmlib_image/mlib_image_proto.h
View File

@ -1054,7 +1054,7 @@ mlib_status __mlib_ImageColorYCC2RGB_Fp(mlib_image *dst,
#if defined ( __MEDIALIB_OLD_NAMES )
#define __mlib_ImageCreate mlib_ImageCreate
#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
JNIEXPORT mlib_image * JNICALL
JNIEXPORT mlib_image *
__mlib_ImageCreate(mlib_type type,
mlib_s32 channels,
mlib_s32 width,
@ -1064,7 +1064,7 @@ __mlib_ImageCreate(mlib_type type,
#if defined ( __MEDIALIB_OLD_NAMES )
#define __mlib_ImageCreateStruct mlib_ImageCreateStruct
#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
JNIEXPORT mlib_image * JNICALL
JNIEXPORT mlib_image *
__mlib_ImageCreateStruct(mlib_type type,
mlib_s32 channels,
mlib_s32 width,
@ -1086,7 +1086,7 @@ mlib_image * __mlib_ImageCreateSubimage(mlib_image *img,
#if defined ( __MEDIALIB_OLD_NAMES )
#define __mlib_ImageDelete mlib_ImageDelete
#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
JNIEXPORT void JNICALL
JNIEXPORT void
__mlib_ImageDelete(mlib_image *img);
@ -1416,7 +1416,7 @@ mlib_status __mlib_ImageFourierTransform(mlib_image *dst,
#if defined ( __MEDIALIB_OLD_NAMES )
#define __mlib_ImageAffine mlib_ImageAffine
#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
JNIEXPORT mlib_status JNICALL
JNIEXPORT mlib_status
__mlib_ImageAffine(mlib_image *dst,
const mlib_image *src,
const mlib_d64 *mtx,
@ -2297,7 +2297,7 @@ mlib_status __mlib_ImageHistogram2(mlib_s32 ** histo,
#if defined ( __MEDIALIB_OLD_NAMES )
#define __mlib_ImageLookUp mlib_ImageLookUp
#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
JNIEXPORT mlib_status JNICALL
JNIEXPORT mlib_status
__mlib_ImageLookUp(mlib_image *dst,
const mlib_image *src,
const void **table);
@ -2626,7 +2626,7 @@ mlib_status __mlib_ImageConv7x7_Fp(mlib_image *dst,
#if defined ( __MEDIALIB_OLD_NAMES )
#define __mlib_ImageConvKernelConvert mlib_ImageConvKernelConvert
#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
JNIEXPORT mlib_status JNICALL
JNIEXPORT mlib_status
__mlib_ImageConvKernelConvert(mlib_s32 *ikernel,
mlib_s32 *iscale,
const mlib_d64 *fkernel,
@ -2638,7 +2638,7 @@ __mlib_ImageConvKernelConvert(mlib_s32 *ikernel,
#if defined ( __MEDIALIB_OLD_NAMES )
#define __mlib_ImageConvMxN mlib_ImageConvMxN
#endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
JNIEXPORT mlib_status JNICALL
JNIEXPORT mlib_status
__mlib_ImageConvMxN(mlib_image *dst,
const mlib_image *src,
const mlib_s32 *kernel,