diff options
author | Sven Gothel <[email protected]> | 2010-03-29 04:51:49 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2010-03-29 04:51:49 +0200 |
commit | 69fe372b874d913e2d1c27f1d103e1fced668ecf (patch) | |
tree | cf402337903ba3d02bbab628f2f82a23908a5f11 /src/java/com/jogamp/gluegen/runtime/PointerBufferME_CDC_FP.java | |
parent | 2138fc787c1e497be7f373aa68b3f751c955008f (diff) | |
parent | 2d76c16b9384d383d3e6a9d7cb727f2591a39228 (diff) |
Resolved conflicts
Diffstat (limited to 'src/java/com/jogamp/gluegen/runtime/PointerBufferME_CDC_FP.java')
-rwxr-xr-x | src/java/com/jogamp/gluegen/runtime/PointerBufferME_CDC_FP.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/java/com/jogamp/gluegen/runtime/PointerBufferME_CDC_FP.java b/src/java/com/jogamp/gluegen/runtime/PointerBufferME_CDC_FP.java index 0ae7af6..1134ee7 100755 --- a/src/java/com/jogamp/gluegen/runtime/PointerBufferME_CDC_FP.java +++ b/src/java/com/jogamp/gluegen/runtime/PointerBufferME_CDC_FP.java @@ -65,7 +65,7 @@ final class PointerBufferME_CDC_FP extends PointerBuffer { idx = idx << 1; // 8-byte to 4-byte offset long lo = 0x00000000FFFFFFFFL & ((long) pb.get(idx)); long hi = 0x00000000FFFFFFFFL & ((long) pb.get(idx + 1)); - if (BufferFactory.isLittleEndian()) { + if (Platform.isLittleEndian()) { return hi << 32 | lo; } return lo << 32 | hi; @@ -83,7 +83,7 @@ final class PointerBufferME_CDC_FP extends PointerBuffer { idx = idx << 1; // 8-byte to 4-byte offset int lo = (int) ((v) & 0x00000000FFFFFFFFL); int hi = (int) ((v >> 32) & 0x00000000FFFFFFFFL); - if (BufferFactory.isLittleEndian()) { + if (Platform.isLittleEndian()) { pb.put(idx, lo); pb.put(idx + 1, hi); } else { |