Skip to content

Merge master into devel #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hageldave merged 6 commits into from
Oct 28, 2020
Merged

Merge master into devel #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be207f0
Update .travis.yml
hageldave Jul 31, 2019
75216c5
update IOTest: cannot use jpeg compression since openJDK does not shi…
hageldave Jul 31, 2019
d49b0b5
Bump junit from 4.12 to 4.13.1 in /ImagingKit_Core
dependabot[bot] Oct 12, 2020
918c8bb
Merge pull request #18 from hageldave/dependabot/maven/ImagingKit_Cor…
dependabot[bot] Oct 13, 2020
60bb33d
merged devel2.0
hageldave Oct 23, 2020
a28a2f9
Update README.md
hageldave Oct 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ImagingKit_Core/src/test/java/hageldave/imagingkit/core/io/IOTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,9 @@ public void iotest(){
}

{// save Stream load Stream
Img img = new Img(100, 100);
// need uniform grey so jpeg compression will not alter the color
img.fill(0xff888888);
Img img = getTestImg(64,64);
ByteArrayOutputStream out = new ByteArrayOutputStream();
ImageSaver.saveImage(img.getRemoteBufferedImage(), out, "jpg");
ImageSaver.saveImage(img.getRemoteBufferedImage(), out, "png");
BufferedImage bimg = ImageLoader.loadImage(
new ByteArrayInputStream(out.toByteArray()), BufferedImage.TYPE_INT_ARGB);
Img loaded = Img.createRemoteImg(bimg);
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#### [Master Branch](https://github.com/hageldave/ImagingKit/tree/master)
[![Build Status](https://travis-ci.org/hageldave/ImagingKit.svg?branch=master)](https://travis-ci.org/hageldave/ImagingKit/branches)
[![Coverage Status](https://coveralls.io/repos/github/hageldave/ImagingKit/badge.svg?branch=master)](https://coveralls.io/github/hageldave/ImagingKit?branch=master)
[![Maven Central](https://img.shields.io/maven-central/v/com.github.hageldave.imagingkit/imagingkit-core.svg)](http://search.maven.org/#artifactdetails|com.github.hageldave.imagingkit|imagingkit-core|2.0|jar)
[![Maven Central](https://img.shields.io/maven-central/v/com.github.hageldave.imagingkit/imagingkit-core.svg)](http://search.maven.org/#artifactdetails|com.github.hageldave.imagingkit|imagingkit-core|2.1|jar)
---
#### [Development Branch](https://github.com/hageldave/ImagingKit/tree/devel2.0)
[![Build Status](https://travis-ci.org/hageldave/ImagingKit.svg?branch=devel2.0)](https://travis-ci.org/hageldave/ImagingKit/branches)
Expand All @@ -16,13 +16,13 @@ So far the *ImagingKit-Core* and *ImagingKit-Fourier* artifacts of the library a
<dependency>
<groupId>com.github.hageldave.imagingkit</groupId>
<artifactId>imagingkit-core</artifactId>
<version>2.0</version>
<version>2.1</version>
</dependency>

<dependency>
<groupId>com.github.hageldave.imagingkit</groupId>
<artifactId>imagingkit-fourier</artifactId>
<version>2.0</version>
<version>2.1</version>
</dependency>
```

Expand Down