Skip to content

Commit

Permalink
Move libjpeg-turbo to match Chromium
Browse files Browse the repository at this point in the history
Issue: 326748668
Reviewed-on: #3150
  • Loading branch information
dahlstrom-g committed May 4, 2024
2 parents b30ba78 + 6ad225a commit 35f7288
Show file tree
Hide file tree
Showing 303 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion cobalt/loader/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ static_library("loader") {
"//cobalt/renderer/test/png_utils",
"//cobalt/web",
"//net",
"//third_party/libjpeg-turbo:libjpeg",
"//third_party/libjpeg_turbo:libjpeg",
"//third_party/libpng",
"//third_party/libwebp",
"//third_party/protobuf:protobuf_lite",
Expand Down
2 changes: 1 addition & 1 deletion cobalt/loader/image/jpeg_image_decoder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "base/logging.h"
#include "base/trace_event/trace_event.h"
#include "cobalt/base/console_log.h"
#include "third_party/libjpeg-turbo/jpegint.h"
#include "third_party/libjpeg_turbo/jpegint.h"

namespace cobalt {
namespace loader {
Expand Down
2 changes: 1 addition & 1 deletion cobalt/loader/image/jpeg_image_decoder.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

// Inhibit C++ name-mangling for libjpeg functions.
extern "C" {
#include "third_party/libjpeg-turbo/jpeglib.h"
#include "third_party/libjpeg_turbo/jpeglib.h"
}

namespace cobalt {
Expand Down
2 changes: 1 addition & 1 deletion cobalt/renderer/test/jpeg_utils/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ static_library("jpeg_utils") {

deps = [
"//base",
"//third_party/libjpeg-turbo:libjpeg",
"//third_party/libjpeg_turbo:libjpeg",
]
}
2 changes: 1 addition & 1 deletion cobalt/renderer/test/jpeg_utils/jpeg_encode.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "base/trace_event/trace_event.h"
#include "starboard/memory.h"
#include "third_party/libjpeg-turbo/turbojpeg.h"
#include "third_party/libjpeg_turbo/turbojpeg.h"

namespace cobalt {
namespace renderer {
Expand Down
2 changes: 1 addition & 1 deletion starboard/linux/x64x11/shared/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ group("starboard_platform") {

deps = [
"//third_party/dav1d",
"//third_party/libjpeg-turbo:libjpeg",
"//third_party/libjpeg_turbo:libjpeg",
"//third_party/libvpx",
]
}
Expand Down
4 changes: 2 additions & 2 deletions starboard/shared/libjpeg/jpeg_image_decoder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
// Inhibit C++ name-mangling for libjpeg functions.
extern "C" {
// clang-format off
#include "third_party/libjpeg-turbo/jpeglib.h"
#include "third_party/libjpeg-turbo/jpegint.h"
#include "third_party/libjpeg_turbo/jpeglib.h"
#include "third_party/libjpeg_turbo/jpegint.h"
// clang-format on
}

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 35f7288

Please sign in to comment.