Skip to content

Feature/fix libde265 build #111

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

Open
mahendrana wants to merge 19 commits into
base: main
Choose a base branch
from
Open

Feature/fix libde265 build #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ae379d4
Renaming of libde265 library
mahendrana May 13, 2025
bfa49e9
Update libde265 version to v1.0.15
mahendrana May 13, 2025
333af17
Corrected a typo
mahendrana May 14, 2025
af4f9b1
Another typo correction
mahendrana May 14, 2025
98953c0
Update libheif.targets
ganeshmaa May 15, 2025
0c784d2
Merge pull request #113 from ganeshmaa/patch-2
mitchelsellers May 15, 2025
13b8ce2
Use LibHeif v1.19.1
mahendrana May 15, 2025
1329093
Fix header file path
mahendrana May 15, 2025
9abb0a8
Fix header file path
mahendrana May 15, 2025
3d13320
Fix header file path
mahendrana May 15, 2025
0336246
Try LibHeif v1.17.6
mahendrana May 15, 2025
6f65662
Revert libheif header path
mahendrana May 15, 2025
33cf1c1
Revert libheif header path
mahendrana May 15, 2025
1fd3b3a
Revert libheif header path
mahendrana May 15, 2025
f29ef06
Try LibHeif v1.19.1
mahendrana May 15, 2025
d41e13f
Use header path that corresponds to v1.19.1
mahendrana May 15, 2025
a7b5acd
Use header path that corresponds to v1.19.1
mahendrana May 15, 2025
477c5f5
Use header path that corresponds to v1.19.1
mahendrana May 15, 2025
4c2a165
Update of expected ID values, as the encoded data with the LibHeif v1…
mahendrana May 16, 2025
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
2 changes: 1 addition & 1 deletion src/FileOnQ.Imaging.Heif.Encoders/encoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <string>
#include <memory>

#include <libheif/heif.h>
#include <libheif/api/libheif/heif.h>


class Encoder
Expand Down
4 changes: 2 additions & 2 deletions src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <iostream>
#include <libheif/heif.h>
#include <libheif/api/libheif/heif.h>

#include "encoders_api.h"
#include "encoder.h"
Expand Down Expand Up @@ -38,4 +38,4 @@ void free_pointer(void* pointer)
return;

free(pointer);
}
}
4 changes: 2 additions & 2 deletions src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include <iostream>
#include <libheif/heif.h>
#include <libheif/api/libheif/heif.h>

#include "encoder_jpeg.h"

Expand All @@ -16,4 +16,4 @@ extern "C" ENCODERS_API heif_colorspace encoder_colorspace(Encoder * encoder, bo
extern "C" ENCODERS_API heif_chroma encoder_chroma(Encoder * encoder, bool has_alpha, int bit_depth);
extern "C" ENCODERS_API bool encode(Encoder* encoder, const struct heif_image_handle* handle, const struct heif_image* image, unsigned char** buffer, unsigned long* buffer_size);
extern "C" ENCODERS_API void encoder_update_decoding_options(Encoder * encoder, const struct heif_image_handle* handle, struct heif_decoding_options* options);
extern "C" ENCODERS_API void free_pointer(void* pointer);
extern "C" ENCODERS_API void free_pointer(void* pointer);
14 changes: 9 additions & 5 deletions src/FileOnQ.Imaging.Heif/Build/libde265.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,24 @@

<Target Name="libde265-clone-x86" Condition="!Exists('$(ThirdPartyDir)/libde265-x86/README.md')">
<Exec Command="git clone https://github.com/strukturag/libde265.git libde265-x86" WorkingDirectory="$(ThirdPartyDir)" />
<Exec Command="git checkout v1.0.8" WorkingDirectory="$(ThirdPartyDir)/libde265-x86" />
<Exec Command="git checkout v1.0.15" WorkingDirectory="$(ThirdPartyDir)/libde265-x86" />
</Target>

<Target Name="libde265-clone-x64" Condition="!Exists('$(ThirdPartyDir)/libde265-x64/README.md')">
<Exec Command="git clone https://github.com/strukturag/libde265.git libde265-x64" WorkingDirectory="$(ThirdPartyDir)" />
<Exec Command="git checkout v1.0.8" WorkingDirectory="$(ThirdPartyDir)/libde265-x64" />
<Exec Command="git checkout v1.0.15" WorkingDirectory="$(ThirdPartyDir)/libde265-x64" />
</Target>

<Target Name="libde265" DependsOnTargets="libde265-clone-x64;libde265-clone-x86" Condition="!Exists('runtimes/win-x64/native/libde265.dll') and !Exists('runtimes/win-x86/native/libde265.dll')">
<Exec Command="libde265.bat x86 $(Configuration)" WorkingDirectory="$(ThirdPartyDir)/../build" />
<Exec Command="libde265.bat x64 $(Configuration)" WorkingDirectory="$(ThirdPartyDir)/../build" />

<Copy SourceFiles="$(ThirdPartyDir)/libde265-x86/libde265/libde265.dll" DestinationFolder="runtimes/win-x86/native" />
<Copy SourceFiles="$(ThirdPartyDir)/libde265-x86/libde265/de265.lib" DestinationFiles="$(ThirdPartyDir)/libde265-x86/libde265/libde265.lib" />
<Copy SourceFiles="$(ThirdPartyDir)/libde265-x86/libde265/de265.exp" DestinationFiles="$(ThirdPartyDir)/libde265-x86/libde265/libde265.exp" />

<Exec Command="libde265.bat x64 $(Configuration)" WorkingDirectory="$(ThirdPartyDir)/../build" />
<Copy SourceFiles="$(ThirdPartyDir)/libde265-x64/libde265/libde265.dll" DestinationFolder="runtimes/win-x64/native" />
<Copy SourceFiles="$(ThirdPartyDir)/libde265-x64/libde265/de265.lib" DestinationFiles="$(ThirdPartyDir)/libde265-x64/libde265/libde265.lib" />
<Copy SourceFiles="$(ThirdPartyDir)/libde265-x64/libde265/de265.exp" DestinationFiles="$(ThirdPartyDir)/libde265-x64/libde265/libde265.exp" />
</Target>

<Target Name="libde265-clean" BeforeTargets="Clean">
Expand All @@ -25,4 +29,4 @@
<Delete Files="runtimes/win-x86/native/libde265.dll" />
<Delete Files="runtimes/win-x64/native/libde265.dll" />
</Target>
</Project>
</Project>
6 changes: 3 additions & 3 deletions src/FileOnQ.Imaging.Heif/Build/libheif.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@

<Target Name="LibHeif-Clone-x86" Condition="!Exists('$(ThirdPartyDir)/libheif-x86/README.md')">
<Exec Command="git clone https://github.com/strukturag/libheif.git libheif-x86" WorkingDirectory="$(ThirdPartyDir)" />
<Exec Command="git checkout v1.12.0" WorkingDirectory="$(ThirdPartyDir)/libheif-x86" />
<Exec Command="git checkout v1.19.1" WorkingDirectory="$(ThirdPartyDir)/libheif-x86" />
</Target>

<Target Name="LibHeif-Clone-x64" Condition="!Exists('$(ThirdPartyDir)/libheif-x64/README.md')">
<Exec Command="git clone https://github.com/strukturag/libheif.git libheif-x64" WorkingDirectory="$(ThirdPartyDir)" />
<Exec Command="git checkout v1.12.0" WorkingDirectory="$(ThirdPartyDir)/libheif-x64" />
<Exec Command="git checkout v1.19.1" WorkingDirectory="$(ThirdPartyDir)/libheif-x64" />
</Target>

<Target Name="LibHeif-Clean" BeforeTargets="Clean" >
Expand All @@ -50,4 +50,4 @@
<Delete Files="runtimes/win-x64/native/heif.dll" />
<Delete Files="runtimes/win-x64/native/libde265.dll" />
</Target>
</Project>
</Project>
20 changes: 10 additions & 10 deletions tests/FileOnQ.Imaging.Heif.Tests/TestData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ public static class PrimaryImageSave
static IDictionary<string, string> BuildDictionary() =>
new Dictionary<string, string>
{
{ Image1, "FFEA4484A3DE2DBE3D85321EF5ABDFF2C5D4367F6D77F2899CB0D62B270A9388" },
{ Image2, "AA9A7640A97AA5824ECBD84C3CDCB23117A7E01BC7A313C6390B0702559579A7" },
{ Image3, "D544E3BA40215AE671DE0D4474489F596AA6AFB27F9774E6C3B322242B17634F" },
{ Image4, "51BF8E1F356A618E3D86E13560B557B91CB6C6269F0C6298BEBDC447675A4250" },
{ Image5, "0B223CCEE9712EAD50F51E0AE96DA5276DE98D0ED48B60D958B354B228B88B01" }
{ Image1, "357C170D04A5FD62D19E782FC05EBD717B656DADB1ABA4920E042D91A265F294" },
{ Image2, "DBB83C7C34F11752644B42C8B5DA94D4397AF5C5C4E8051DA81DCCEC4DDC229C" },
{ Image3, "5532E2143B056E2D125D83B4CCA55136C360F60F039831249F241DB42C6BD6B4" },
{ Image4, "6A78A1511735BF2573B48AC23071FCE493E8A81F2A8A409C290D12EDA8553C83" },
{ Image5, "14B45F3337FB5AC9C252F16E0E3A57A42D6A9BC124950B7F35DAE16B547C385D" }
};
}

Expand All @@ -35,11 +35,11 @@ public static class ThuumbnailSave
static IDictionary<string, string> BuildDictionary() =>
new Dictionary<string, string>
{
{ Image1, "FFEA4484A3DE2DBE3D85321EF5ABDFF2C5D4367F6D77F2899CB0D62B270A9388" },
{ Image2, "AA9A7640A97AA5824ECBD84C3CDCB23117A7E01BC7A313C6390B0702559579A7" },
{ Image3, "D544E3BA40215AE671DE0D4474489F596AA6AFB27F9774E6C3B322242B17634F" },
{ Image4, "51BF8E1F356A618E3D86E13560B557B91CB6C6269F0C6298BEBDC447675A4250" },
{ Image5, "6D9C8D886B8EC7215233A1E596BFC4B21AB1E51F636E944EAE94582456E0B022" }
{ Image1, "357C170D04A5FD62D19E782FC05EBD717B656DADB1ABA4920E042D91A265F294" },
{ Image2, "DBB83C7C34F11752644B42C8B5DA94D4397AF5C5C4E8051DA81DCCEC4DDC229C" },
{ Image3, "5532E2143B056E2D125D83B4CCA55136C360F60F039831249F241DB42C6BD6B4" },
{ Image4, "6A78A1511735BF2573B48AC23071FCE493E8A81F2A8A409C290D12EDA8553C83" },
{ Image5, "C1F02AE3D0C9BD858FEBBA5B3B5492B128B220318D49E21741AB5A0567DB9E05" }
};
}
}
Expand Down
Loading